Skip to content

Commit 6d9a8b0

Browse files
stsewdstsewd
committed
Fix some tests
1 parent b2e2a8b commit 6d9a8b0

File tree

6 files changed

+30
-33
lines changed

6 files changed

+30
-33
lines changed

‎readthedocs/rtd_tests/tests/test_api.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ def test_get_raw_log_success(self):
438438
)
439439
client = APIClient()
440440

441-
api_user = get(User, user='test', password='test')
441+
api_user = get(User)
442442
client.force_authenticate(user=api_user)
443443
resp = client.get('/api/v2/build/{}.txt'.format(build.pk))
444444
self.assertEqual(resp.status_code, 200)
@@ -482,7 +482,7 @@ def test_get_raw_log_building(self):
482482
)
483483
client = APIClient()
484484

485-
api_user = get(User, user='test', password='test')
485+
api_user = get(User)
486486
client.force_authenticate(user=api_user)
487487
resp = client.get('/api/v2/build/{}.txt'.format(build.pk))
488488
self.assertEqual(resp.status_code, 200)
@@ -525,7 +525,7 @@ def test_get_raw_log_failure(self):
525525
)
526526
client = APIClient()
527527

528-
api_user = get(User, user='test', password='test')
528+
api_user = get(User)
529529
client.force_authenticate(user=api_user)
530530
resp = client.get('/api/v2/build/{}.txt'.format(build.pk))
531531
self.assertEqual(resp.status_code, 200)
@@ -551,7 +551,7 @@ def test_get_raw_log_failure(self):
551551
def test_get_invalid_raw_log(self):
552552
client = APIClient()
553553

554-
api_user = get(User, user='test', password='test')
554+
api_user = get(User)
555555
client.force_authenticate(user=api_user)
556556
resp = client.get('/api/v2/build/{}.txt'.format(404))
557557
self.assertEqual(resp.status_code, status.HTTP_404_NOT_FOUND)

‎readthedocs/rtd_tests/tests/test_builds.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -416,19 +416,19 @@ def test_get_previous_build(self):
416416
Build,
417417
project=self.project,
418418
version=self.version,
419-
config={'version': 1},
419+
_config={'version': 1},
420420
)
421421
build_two = get(
422422
Build,
423423
project=self.project,
424424
version=self.version,
425-
config={'version': 2},
425+
_config={'version': 2},
426426
)
427427
build_three = get(
428428
Build,
429429
project=self.project,
430430
version=self.version,
431-
config={'version': 3},
431+
_config={'version': 3},
432432
success=False,
433433
)
434434

@@ -631,7 +631,7 @@ def test_build_is_external(self):
631631
Build,
632632
project=self.project,
633633
version=self.version,
634-
config={'version': 1},
634+
_config={'version': 1},
635635
)
636636

637637
self.assertTrue(external_build.is_external)
@@ -641,7 +641,7 @@ def test_build_is_not_external(self):
641641
Build,
642642
project=self.project,
643643
version=self.version,
644-
config={'version': 1},
644+
_config={'version': 1},
645645
)
646646

647647
self.assertFalse(build.is_external)
@@ -651,7 +651,7 @@ def test_no_external_version_name(self):
651651
Build,
652652
project=self.project,
653653
version=self.version,
654-
config={'version': 1},
654+
_config={'version': 1},
655655
)
656656

657657
self.assertEqual(build.external_version_name, None)
@@ -693,7 +693,7 @@ def test_external_version_name_generic(self):
693693
Build,
694694
project=self.project,
695695
version=self.version,
696-
config={'version': 1},
696+
_config={'version': 1},
697697
)
698698

699699
self.assertEqual(
@@ -709,7 +709,7 @@ def test_get_commit_url_external_version_github(self):
709709
Build,
710710
project=self.pip,
711711
version=self.external_version,
712-
config={'version': 1},
712+
_config={'version': 1},
713713
)
714714
expected_url = 'https://github.com/pypa/pip/pull/{number}/commits/{sha}'.format(
715715
number=self.external_version.verbose_name,
@@ -725,7 +725,7 @@ def test_get_commit_url_external_version_gitlab(self):
725725
Build,
726726
project=self.pip,
727727
version=self.external_version,
728-
config={'version': 1},
728+
_config={'version': 1},
729729
)
730730
expected_url = (
731731
'https://gitlab.com/pypa/pip/commit/'
@@ -741,7 +741,7 @@ def test_get_commit_url_internal_version(self):
741741
Build,
742742
project=self.pip,
743743
version=self.pip_version,
744-
config={'version': 1},
744+
_config={'version': 1},
745745
)
746746
expected_url = 'https://github.com/pypa/pip/commit/{sha}'.format(
747747
sha=build.commit

‎readthedocs/rtd_tests/tests/test_middleware.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,13 @@ def setUp(self):
171171
self.project = get(
172172
Project, slug='pip',
173173
users=[self.owner], privacy_level='public',
174-
mail_language_project=None,
174+
main_language_project=None,
175175
)
176176
self.subproject = get(
177177
Project,
178178
users=[self.owner],
179179
privacy_level='public',
180-
mail_language_project=None,
180+
main_language_project=None,
181181
)
182182
self.relationship = get(
183183
ProjectRelationship,

‎readthedocs/rtd_tests/tests/test_privacy_urls.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def setUp(self):
162162
response_headers='{"foo": "bar"}',
163163
status_code=200,
164164
)
165-
self.domain = get(Domain, url='http://docs.foobar.com', project=self.pip)
165+
self.domain = get(Domain, domain='docs.foobar.com', project=self.pip)
166166
self.environment_variable = get(EnvironmentVariable, project=self.pip)
167167
self.automation_rule = RegexAutomationRule.objects.create(
168168
project=self.pip,
@@ -349,8 +349,8 @@ class APIMixin(URLAccessMixin):
349349
def setUp(self):
350350
super().setUp()
351351
self.build = get(Build, project=self.pip)
352-
self.build_command_result = get(BuildCommandResult, project=self.pip)
353-
self.domain = get(Domain, url='http://docs.foobar.com', project=self.pip)
352+
self.build_command_result = get(BuildCommandResult, build=self.build)
353+
self.domain = get(Domain, domain='docs.foobar.com', project=self.pip)
354354
self.social_account = get(SocialAccount)
355355
self.remote_org = get(RemoteOrganization)
356356
self.remote_repo = get(RemoteRepository, organization=self.remote_org)

‎readthedocs/rtd_tests/tests/test_project_symlinks.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- coding: utf-8 -*-
2-
31
import os
42
import shutil
53
import tempfile
@@ -147,7 +145,7 @@ def setUp(self):
147145
def test_symlink_cname(self):
148146
self.domain = get(
149147
Domain, project=self.project, domain='woot.com',
150-
url='http://woot.com', cname=True,
148+
cname=True,
151149
)
152150
self.symlink.symlink_cnames()
153151
filesystem = {
@@ -181,7 +179,7 @@ def test_symlink_cname(self):
181179
def test_symlink_remove_orphan_symlinks(self):
182180
self.domain = get(
183181
Domain, project=self.project, domain='woot.com',
184-
url='http://woot.com', cname=True,
182+
cname=True,
185183
)
186184
self.symlink.symlink_cnames()
187185

@@ -267,7 +265,7 @@ def test_symlink_cname_dont_link_missing_domains(self):
267265
"""Domains should be relinked after deletion."""
268266
self.domain = get(
269267
Domain, project=self.project, domain='woot.com',
270-
url='http://woot.com', cname=True,
268+
cname=True,
271269
)
272270
self.symlink.symlink_cnames()
273271
filesystem = {

‎readthedocs/rtd_tests/tests/test_version_config.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
from django.test import TestCase
32
from django_dynamic_fixture import get
43

@@ -16,23 +15,23 @@ def test_get_correct_config(self):
1615
build_old = Build.objects.create(
1716
project=self.project,
1817
version=self.version,
19-
config={'version': 1},
18+
_config={'version': 1},
2019
)
2120
build_new = Build.objects.create(
2221
project=self.project,
2322
version=self.version,
24-
config={'version': 2},
23+
_config={'version': 2},
2524
)
2625
build_new_error = Build.objects.create(
2726
project=self.project,
2827
version=self.version,
29-
config={'version': 3},
28+
_config={'version': 3},
3029
success=False,
3130
)
3231
build_new_unfinish = Build.objects.create(
3332
project=self.project,
3433
version=self.version,
35-
config={'version': 4},
34+
_config={'version': 4},
3635
state='building',
3736
)
3837
self.assertEqual(self.version.config, {'version': 2})
@@ -42,7 +41,7 @@ def test_get_correct_config_when_same_config(self):
4241
Build,
4342
project=self.project,
4443
version=self.version,
45-
config={},
44+
_config={},
4645
)
4746
build_old.config = {'version': 1}
4847
build_old.save()
@@ -51,7 +50,7 @@ def test_get_correct_config_when_same_config(self):
5150
Build,
5251
project=self.project,
5352
version=self.version,
54-
config={},
53+
_config={},
5554
)
5655
build_new.config = {'version': 1}
5756
build_new.save()
@@ -60,7 +59,7 @@ def test_get_correct_config_when_same_config(self):
6059
Build,
6160
project=self.project,
6261
version=self.version,
63-
config={},
62+
_config={},
6463
success=False,
6564
)
6665
build_new_error.config = {'version': 3}
@@ -70,7 +69,7 @@ def test_get_correct_config_when_same_config(self):
7069
Build,
7170
project=self.project,
7271
version=self.version,
73-
config={},
72+
_config={},
7473
state='building',
7574
)
7675
build_new_unfinish.config = {'version': 1}

0 commit comments

Comments
 (0)