| Index: chrome/common/extensions/docs/server2/branch_utility_test.py
|
| diff --git a/chrome/common/extensions/docs/server2/branch_utility_test.py b/chrome/common/extensions/docs/server2/branch_utility_test.py
|
| index 41488a75d04f99bb6132a59323301e07ab42e89f..db9e87d2979b293383016485af93dc4f8104222c 100755
|
| --- a/chrome/common/extensions/docs/server2/branch_utility_test.py
|
| +++ b/chrome/common/extensions/docs/server2/branch_utility_test.py
|
| @@ -32,9 +32,9 @@ class BranchUtilityTest(unittest.TestCase):
|
| self.assertEquals(('beta', 'extensions/stuff.html'),
|
| self._branch_util.SplitChannelNameFromPath(
|
| 'beta/extensions/stuff.html'))
|
| - self.assertEquals(('trunk', 'extensions/stuff.html'),
|
| + self.assertEquals(('master', 'extensions/stuff.html'),
|
| self._branch_util.SplitChannelNameFromPath(
|
| - 'trunk/extensions/stuff.html'))
|
| + 'master/extensions/stuff.html'))
|
| self.assertEquals((None, 'extensions/stuff.html'),
|
| self._branch_util.SplitChannelNameFromPath(
|
| 'extensions/stuff.html'))
|
| @@ -49,10 +49,10 @@ class BranchUtilityTest(unittest.TestCase):
|
| 'stuff.html'))
|
|
|
| def testNewestChannel(self):
|
| - self.assertEquals('trunk',
|
| - self._branch_util.NewestChannel(('trunk', 'dev', 'beta', 'stable')))
|
| - self.assertEquals('trunk',
|
| - self._branch_util.NewestChannel(('stable', 'beta', 'dev', 'trunk')))
|
| + self.assertEquals('master',
|
| + self._branch_util.NewestChannel(('master', 'dev', 'beta', 'stable')))
|
| + self.assertEquals('master',
|
| + self._branch_util.NewestChannel(('stable', 'beta', 'dev', 'master')))
|
| self.assertEquals('dev',
|
| self._branch_util.NewestChannel(('stable', 'beta', 'dev')))
|
| self.assertEquals('dev',
|
| @@ -64,7 +64,7 @@ class BranchUtilityTest(unittest.TestCase):
|
| self.assertEquals('stable', self._branch_util.NewestChannel(('stable',)))
|
| self.assertEquals('beta', self._branch_util.NewestChannel(('beta',)))
|
| self.assertEquals('dev', self._branch_util.NewestChannel(('dev',)))
|
| - self.assertEquals('trunk', self._branch_util.NewestChannel(('trunk',)))
|
| + self.assertEquals('master', self._branch_util.NewestChannel(('master',)))
|
|
|
| def testNewer(self):
|
| oldest_stable_info = ChannelInfo('stable', '963', 17)
|
| @@ -74,7 +74,7 @@ class BranchUtilityTest(unittest.TestCase):
|
| stable_info = ChannelInfo('stable', '1547', 29)
|
| beta_info = ChannelInfo('beta', '1599', 30)
|
| dev_info = ChannelInfo('dev', '1612', 31)
|
| - trunk_info = ChannelInfo('trunk', 'trunk', 'trunk')
|
| + master_info = ChannelInfo('master', 'master', 'master')
|
|
|
| self.assertEquals(older_stable_info,
|
| self._branch_util.Newer(oldest_stable_info))
|
| @@ -84,13 +84,13 @@ class BranchUtilityTest(unittest.TestCase):
|
| self._branch_util.Newer(sort_of_old_stable_info))
|
| self.assertEquals(beta_info, self._branch_util.Newer(stable_info))
|
| self.assertEquals(dev_info, self._branch_util.Newer(beta_info))
|
| - self.assertEquals(trunk_info, self._branch_util.Newer(dev_info))
|
| + self.assertEquals(master_info, self._branch_util.Newer(dev_info))
|
| # Test the upper limit.
|
| - self.assertEquals(None, self._branch_util.Newer(trunk_info))
|
| + self.assertEquals(None, self._branch_util.Newer(master_info))
|
|
|
|
|
| def testOlder(self):
|
| - trunk_info = ChannelInfo('trunk', 'trunk', 'trunk')
|
| + master_info = ChannelInfo('master', 'master', 'master')
|
| dev_info = ChannelInfo('dev', '1612', 31)
|
| beta_info = ChannelInfo('beta', '1599', 30)
|
| stable_info = ChannelInfo('stable', '1547', 29)
|
| @@ -98,7 +98,7 @@ class BranchUtilityTest(unittest.TestCase):
|
| older_stable_info = ChannelInfo('stable', '1453', 27)
|
| oldest_stable_info = ChannelInfo('stable', '396', 5)
|
|
|
| - self.assertEquals(dev_info, self._branch_util.Older(trunk_info))
|
| + self.assertEquals(dev_info, self._branch_util.Older(master_info))
|
| self.assertEquals(beta_info, self._branch_util.Older(dev_info))
|
| self.assertEquals(stable_info, self._branch_util.Older(beta_info))
|
| self.assertEquals(old_stable_info, self._branch_util.Older(stable_info))
|
| @@ -108,8 +108,8 @@ class BranchUtilityTest(unittest.TestCase):
|
| self.assertEquals(None, self._branch_util.Older(oldest_stable_info))
|
|
|
| def testGetChannelInfo(self):
|
| - trunk_info = ChannelInfo('trunk', 'trunk', 'trunk')
|
| - self.assertEquals(trunk_info, self._branch_util.GetChannelInfo('trunk'))
|
| + master_info = ChannelInfo('master', 'master', 'master')
|
| + self.assertEquals(master_info, self._branch_util.GetChannelInfo('master'))
|
|
|
| dev_info = ChannelInfo('dev', '1612', 31)
|
| self.assertEquals(dev_info, self._branch_util.GetChannelInfo('dev'))
|
| @@ -154,8 +154,8 @@ class BranchUtilityTest(unittest.TestCase):
|
| self._branch_util.GetBranchForVersion(5))
|
|
|
| def testGetChannelForVersion(self):
|
| - self.assertEquals('trunk',
|
| - self._branch_util.GetChannelForVersion('trunk'))
|
| + self.assertEquals('master',
|
| + self._branch_util.GetChannelForVersion('master'))
|
| self.assertEquals('dev',
|
| self._branch_util.GetChannelForVersion(31))
|
| self.assertEquals('beta',
|
|
|