Skip to content

Commit 7937c4b

Browse files
committed
fix test naming conventions and inherit class from object
1 parent a24c303 commit 7937c4b

File tree

2 files changed

+72
-72
lines changed

2 files changed

+72
-72
lines changed

readthedocs/config/tests/test_config.py

+42-42
Original file line numberDiff line numberDiff line change
@@ -274,15 +274,15 @@ def test_python_pip_install_default():
274274
assert build.python.install_with_pip is False
275275

276276

277-
class ValidatePythonExtraRequirements:
277+
class TestValidatePythonExtraRequirements(object):
278278

279-
def it_defaults_to_list(self):
279+
def test_it_defaults_to_list(self):
280280
build = get_build_config({'python': {}}, get_env_config())
281281
build.validate()
282282
# Default is an empty list.
283283
assert build.python.extra_requirements == []
284284

285-
def it_validates_is_a_list(self):
285+
def test_it_validates_is_a_list(self):
286286
build = get_build_config(
287287
{'python': {'extra_requirements': 'invalid'}},
288288
get_env_config(),
@@ -293,7 +293,7 @@ def it_validates_is_a_list(self):
293293
assert excinfo.value.code == PYTHON_INVALID
294294

295295
@patch('readthedocs.config.config.validate_string')
296-
def it_uses_validate_string(self, validate_string):
296+
def test_it_uses_validate_string(self, validate_string):
297297
validate_string.return_value = True
298298
build = get_build_config(
299299
{
@@ -308,14 +308,14 @@ def it_uses_validate_string(self, validate_string):
308308
validate_string.assert_any_call('tests')
309309

310310

311-
class ValidateUseSystemSitePackages:
311+
class TestValidateUseSystemSitePackages(object):
312312

313-
def it_defaults_to_false(self):
313+
def test_it_defaults_to_false(self):
314314
build = get_build_config({'python': {}}, get_env_config())
315315
build.validate()
316316
assert build.python.use_system_site_packages is False
317317

318-
def it_validates_value(self):
318+
def test_it_validates_value(self):
319319
build = get_build_config(
320320
{'python': {'use_system_site_packages': 'invalid'}},
321321
get_env_config(),
@@ -326,7 +326,7 @@ def it_validates_value(self):
326326
excinfo.value.code = INVALID_BOOL
327327

328328
@patch('readthedocs.config.config.validate_bool')
329-
def it_uses_validate_bool(self, validate_bool):
329+
def test_it_uses_validate_bool(self, validate_bool):
330330
validate_bool.return_value = True
331331
build = get_build_config(
332332
{'python': {'use_system_site_packages': 'to-validate'}},
@@ -336,14 +336,14 @@ def it_uses_validate_bool(self, validate_bool):
336336
validate_bool.assert_any_call('to-validate')
337337

338338

339-
class ValidateSetupPyInstall:
339+
class TestValidateSetupPyInstall(object):
340340

341-
def it_defaults_to_false(self):
341+
def test_it_defaults_to_false(self):
342342
build = get_build_config({'python': {}}, get_env_config())
343343
build.validate()
344344
assert build.python.install_with_setup is False
345345

346-
def it_validates_value(self):
346+
def test_it_validates_value(self):
347347
build = get_build_config(
348348
{'python': {'setup_py_install': 'this-is-string'}},
349349
get_env_config(),
@@ -354,7 +354,7 @@ def it_validates_value(self):
354354
assert excinfo.value.code == INVALID_BOOL
355355

356356
@patch('readthedocs.config.config.validate_bool')
357-
def it_uses_validate_bool(self, validate_bool):
357+
def test_it_uses_validate_bool(self, validate_bool):
358358
validate_bool.return_value = True
359359
build = get_build_config(
360360
{'python': {'setup_py_install': 'to-validate'}},
@@ -364,16 +364,16 @@ def it_uses_validate_bool(self, validate_bool):
364364
validate_bool.assert_any_call('to-validate')
365365

366366

367-
class ValidateVersion:
367+
class TestValidatePythonVersion(object):
368368

369-
def it_defaults_to_a_valid_version(self):
369+
def test_it_defaults_to_a_valid_version(self):
370370
build = get_build_config({'python': {}}, get_env_config())
371371
build.validate()
372372
assert build.python.version == 2
373373
assert build.python_interpreter == 'python2.7'
374374
assert build.python_full_version == 2.7
375375

376-
def it_supports_other_versions(self):
376+
def test_it_supports_other_versions(self):
377377
build = get_build_config(
378378
{'python': {'version': 3.5}},
379379
get_env_config(),
@@ -383,7 +383,7 @@ def it_supports_other_versions(self):
383383
assert build.python_interpreter == 'python3.5'
384384
assert build.python_full_version == 3.5
385385

386-
def it_validates_versions_out_of_range(self):
386+
def test_it_validates_versions_out_of_range(self):
387387
build = get_build_config(
388388
{'python': {'version': 1.0}},
389389
get_env_config(),
@@ -393,7 +393,7 @@ def it_validates_versions_out_of_range(self):
393393
assert excinfo.value.key == 'python.version'
394394
assert excinfo.value.code == INVALID_CHOICE
395395

396-
def it_validates_wrong_type(self):
396+
def test_it_validates_wrong_type(self):
397397
build = get_build_config(
398398
{'python': {'version': 'this-is-string'}},
399399
get_env_config(),
@@ -403,7 +403,7 @@ def it_validates_wrong_type(self):
403403
assert excinfo.value.key == 'python.version'
404404
assert excinfo.value.code == INVALID_CHOICE
405405

406-
def it_validates_wrong_type_right_value(self):
406+
def test_it_validates_wrong_type_right_value(self):
407407
build = get_build_config(
408408
{'python': {'version': '3.5'}},
409409
get_env_config(),
@@ -422,7 +422,7 @@ def it_validates_wrong_type_right_value(self):
422422
assert build.python_interpreter == 'python3.5'
423423
assert build.python_full_version == 3.5
424424

425-
def it_validates_env_supported_versions(self):
425+
def test_it_validates_env_supported_versions(self):
426426
build = get_build_config(
427427
{'python': {'version': 3.6}},
428428
env_config=get_env_config(
@@ -452,7 +452,7 @@ def it_validates_env_supported_versions(self):
452452
assert build.python_full_version == 3.6
453453

454454
@pytest.mark.parametrize('value', [2, 3])
455-
def it_respects_default_value(self, value):
455+
def test_it_respects_default_value(self, value):
456456
defaults = {
457457
'python_version': value,
458458
}
@@ -464,42 +464,42 @@ def it_respects_default_value(self, value):
464464
assert build.python.version == value
465465

466466

467-
class ValidateFormats:
467+
class TestValidateFormats(object):
468468

469-
def it_defaults_to_empty(self):
469+
def test_it_defaults_to_empty(self):
470470
build = get_build_config({}, get_env_config())
471471
build.validate()
472472
assert build.formats == []
473473

474-
def it_gets_set_correctly(self):
474+
def test_it_gets_set_correctly(self):
475475
build = get_build_config({'formats': ['pdf']}, get_env_config())
476476
build.validate()
477477
assert build.formats == ['pdf']
478478

479-
def formats_can_be_null(self):
479+
def test_formats_can_be_null(self):
480480
build = get_build_config({'formats': None}, get_env_config())
481481
build.validate()
482482
assert build.formats == []
483483

484-
def formats_with_previous_none(self):
484+
def test_formats_with_previous_none(self):
485485
build = get_build_config({'formats': ['none']}, get_env_config())
486486
build.validate()
487487
assert build.formats == []
488488

489-
def formats_can_be_empty(self):
489+
def test_formats_can_be_empty(self):
490490
build = get_build_config({'formats': []}, get_env_config())
491491
build.validate()
492492
assert build.formats == []
493493

494-
def all_valid_formats(self):
494+
def test_all_valid_formats(self):
495495
build = get_build_config(
496496
{'formats': ['pdf', 'htmlzip', 'epub']},
497497
get_env_config()
498498
)
499499
build.validate()
500500
assert build.formats == ['pdf', 'htmlzip', 'epub']
501501

502-
def cant_have_none_as_format(self):
502+
def test_cant_have_none_as_format(self):
503503
build = get_build_config(
504504
{'formats': ['htmlzip', None]},
505505
get_env_config()
@@ -509,7 +509,7 @@ def cant_have_none_as_format(self):
509509
assert excinfo.value.key == 'format'
510510
assert excinfo.value.code == INVALID_CHOICE
511511

512-
def formats_have_only_allowed_values(self):
512+
def test_formats_have_only_allowed_values(self):
513513
build = get_build_config(
514514
{'formats': ['htmlzip', 'csv']},
515515
get_env_config()
@@ -519,7 +519,7 @@ def formats_have_only_allowed_values(self):
519519
assert excinfo.value.key == 'format'
520520
assert excinfo.value.code == INVALID_CHOICE
521521

522-
def only_list_type(self):
522+
def test_only_list_type(self):
523523
build = get_build_config({'formats': 'no-list'}, get_env_config())
524524
with raises(InvalidConfig) as excinfo:
525525
build.validate()
@@ -544,9 +544,9 @@ def test_valid_build_config():
544544
assert build.output_base
545545

546546

547-
class ValidateBase:
547+
class TestValidateBase(object):
548548

549-
def it_validates_to_abspath(self, tmpdir):
549+
def test_it_validates_to_abspath(self, tmpdir):
550550
apply_fs(tmpdir, {'configs': minimal_config, 'docs': {}})
551551
with tmpdir.as_cwd():
552552
source_file = str(tmpdir.join('configs', 'readthedocs.yml'))
@@ -560,15 +560,15 @@ def it_validates_to_abspath(self, tmpdir):
560560
assert build.base == str(tmpdir.join('docs'))
561561

562562
@patch('readthedocs.config.config.validate_directory')
563-
def it_uses_validate_directory(self, validate_directory):
563+
def test_it_uses_validate_directory(self, validate_directory):
564564
validate_directory.return_value = 'path'
565565
build = get_build_config({'base': '../my-path'}, get_env_config())
566566
build.validate()
567567
# Test for first argument to validate_directory
568568
args, kwargs = validate_directory.call_args
569569
assert args[0] == '../my-path'
570570

571-
def it_fails_if_base_is_not_a_string(self, tmpdir):
571+
def test_it_fails_if_base_is_not_a_string(self, tmpdir):
572572
apply_fs(tmpdir, minimal_config)
573573
with tmpdir.as_cwd():
574574
build = BuildConfigV1(
@@ -582,7 +582,7 @@ def it_fails_if_base_is_not_a_string(self, tmpdir):
582582
assert excinfo.value.key == 'base'
583583
assert excinfo.value.code == INVALID_STRING
584584

585-
def it_fails_if_base_does_not_exist(self, tmpdir):
585+
def test_it_fails_if_base_does_not_exist(self, tmpdir):
586586
apply_fs(tmpdir, minimal_config)
587587
build = BuildConfigV1(
588588
get_env_config(),
@@ -596,9 +596,9 @@ def it_fails_if_base_does_not_exist(self, tmpdir):
596596
assert excinfo.value.code == INVALID_PATH
597597

598598

599-
class ValidateBuild:
599+
class TestValidateBuild(object):
600600

601-
def it_fails_if_build_is_invalid_option(self, tmpdir):
601+
def test_it_fails_if_build_is_invalid_option(self, tmpdir):
602602
apply_fs(tmpdir, minimal_config)
603603
build = BuildConfigV1(
604604
get_env_config(),
@@ -611,7 +611,7 @@ def it_fails_if_build_is_invalid_option(self, tmpdir):
611611
assert excinfo.value.key == 'build'
612612
assert excinfo.value.code == INVALID_CHOICE
613613

614-
def it_fails_on_python_validation(self, tmpdir):
614+
def test_it_fails_on_python_validation(self, tmpdir):
615615
apply_fs(tmpdir, minimal_config)
616616
build = BuildConfigV1(
617617
{},
@@ -628,7 +628,7 @@ def it_fails_on_python_validation(self, tmpdir):
628628
assert excinfo.value.key == 'python.version'
629629
assert excinfo.value.code == INVALID_CHOICE
630630

631-
def it_works_on_python_validation(self, tmpdir):
631+
def test_it_works_on_python_validation(self, tmpdir):
632632
apply_fs(tmpdir, minimal_config)
633633
build = BuildConfigV1(
634634
{},
@@ -642,7 +642,7 @@ def it_works_on_python_validation(self, tmpdir):
642642
build.validate_build()
643643
build.validate_python()
644644

645-
def it_works(self, tmpdir):
645+
def test_it_works(self, tmpdir):
646646
apply_fs(tmpdir, minimal_config)
647647
build = BuildConfigV1(
648648
get_env_config(),
@@ -653,7 +653,7 @@ def it_works(self, tmpdir):
653653
build.validate()
654654
assert build.build.image == 'readthedocs/build:latest'
655655

656-
def default(self, tmpdir):
656+
def test_default(self, tmpdir):
657657
apply_fs(tmpdir, minimal_config)
658658
build = BuildConfigV1(
659659
get_env_config(),
@@ -666,7 +666,7 @@ def default(self, tmpdir):
666666

667667
@pytest.mark.parametrize(
668668
'image', ['latest', 'readthedocs/build:3.0', 'rtd/build:latest'])
669-
def it_priorities_image_from_env_config(self, tmpdir, image):
669+
def test_it_priorities_image_from_env_config(self, tmpdir, image):
670670
apply_fs(tmpdir, minimal_config)
671671
defaults = {
672672
'build_image': image,

0 commit comments

Comments
 (0)