Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Merge pull request #3336 from rtfd/use-active-for-stable" #3368

Merged
merged 6 commits into from
Dec 7, 2017
Merged

Revert "Merge pull request #3336 from rtfd/use-active-for-stable" #3368

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
562692e
Revert "Merge pull request #3336 from rtfd/use-active-for-stable"
ericholscher Dec 6, 2017
6d47a9b
Don't unset machine, when they don't have that version locally
ericholscher Dec 6, 2017
e8bf5c2
ALl of these need to be true, not either or
ericholscher Dec 6, 2017
39f7598
Add test for this case
ericholscher Dec 6, 2017
b4a9fd7
Fix prior test
ericholscher Dec 6, 2017
5f6917c
Cleanup test code and comment it
ericholscher Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion readthedocs/projects/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ def update_stable_version(self):
if current_stable:
identifier_updated = (
new_stable.identifier != current_stable.identifier)
if identifier_updated and current_stable.active:
if identifier_updated and current_stable.active and current_stable.machine:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, comparing this with the original code, we are just adding a another condition (has to be active) but we keep the machine.

In other words, we are just updating the stable version only if, the identifier changed (a new tag become the stable, for example) and the stable version is active and it was created by RTD.

If what I'm saying is correct, I think we are OK :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, thats the goal :)

log.info(
"Update stable version: {project}:{version}".format(
project=self.slug,
Expand Down
81 changes: 77 additions & 4 deletions readthedocs/rtd_tests/tests/test_sync_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,6 @@ def test_update_stable_version(self):
self.assertEqual(version_stable.identifier, '1.0.0')

def test_update_inactive_stable_version(self):
"""
Test that stable doesn't get updated when it isn't active
"""
version_post_data = {
'branches': [
{
Expand Down Expand Up @@ -391,7 +388,7 @@ def test_update_inactive_stable_version(self):

version_stable = Version.objects.get(slug=STABLE)
self.assertFalse(version_stable.active)
self.assertEqual(version_stable.identifier, '0.9')
self.assertEqual(version_stable.identifier, '1.0.0')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this test be for 0.9? Or is this test being repurposed to check the new logic?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, that was the original fix.


def test_stable_version_tags_over_branches(self):
version_post_data = {
Expand Down Expand Up @@ -471,3 +468,79 @@ def test_unicode(self):
content_type='application/json',
)
self.assertEqual(resp.status_code, 200)

def test_user_defined_stable_version_with_tags(self):

Version.objects.create(
project=self.pip,
identifier='0.8.3',
verbose_name='0.8.3',
active=True,
)

Version.objects.create(
project=self.pip,
identifier='foo',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

origin/stable here I guess.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm tested it gets updated from a prior "set" version.

type='branch',
verbose_name='stable',
active=True,
machine=True,
)

version_post_data = {
'branches': [
{
'identifier': 'origin/master',
'verbose_name': 'master',
},
{
'identifier': 'origin/stable',
'verbose_name': 'stable',
},
{
'identifier': 'origin/to_add',
'verbose_name': 'to_add',
},
],
'tags': [
{
'identifier': '0.9',
'verbose_name': '0.9',
},
{
'identifier': '0.8.3',
'verbose_name': '0.8.3',
},
],
}

self.client.post(
'/api/v2/project/{}/sync_versions/'.format(self.pip.pk),
data=json.dumps(version_post_data),
content_type='application/json',
)

version_9 = Version.objects.get(slug='0.9')
self.assertFalse(version_9.active)

version_stable = Version.objects.get(slug='stable')
self.assertFalse(version_stable.machine)
self.assertTrue(version_stable.active)

# Version 0.9 doesn't become stable, since we already had a user-defined stable
self.assertEqual(
'origin/stable',
self.pip.get_stable_version().identifier,
)

self.client.post(
'/api/v2/project/{}/sync_versions/'.format(self.pip.pk),
data=json.dumps(version_post_data),
content_type='application/json',
)

# Version 0.9 doesn't become stable, since we already had a user-defined stable
self.assertEqual(
'origin/stable',
self.pip.get_stable_version().identifier,
)