Skip to content

Commit

Permalink
Fix inconsistent indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanJarv authored and bsclifton committed May 29, 2018
1 parent fa78411 commit 255ba0d
Showing 4 changed files with 49 additions and 49 deletions.
36 changes: 18 additions & 18 deletions tools/lib/helpers.py
Original file line number Diff line number Diff line change
@@ -10,33 +10,33 @@
TARGET_ARCH= os.environ['TARGET_ARCH'] if os.environ.has_key('TARGET_ARCH') else 'x64'

def get_env(env):
token = os.environ[env]
message = ('Error: Please set the ${} environment variable, which is your personal token'.format(env))
assert token, message
return token
token = os.environ[env]
message = ('Error: Please set the ${} environment variable, which is your personal token'.format(env))
assert token, message
return token

def release_channel():
channel = os.environ['CHANNEL']
message = ('Error: Please set the $CHANNEL '
'environment variable, which is your release channel')
assert channel, message
return channel
channel = os.environ['CHANNEL']
message = ('Error: Please set the $CHANNEL '
'environment variable, which is your release channel')
assert channel, message
return channel

def get_channel_display_name():
d = {'dev': 'Release', 'beta': 'Beta', 'developer': 'Developer', 'nightly': 'Nightly'}
return d[release_channel()]
d = {'dev': 'Release', 'beta': 'Beta', 'developer': 'Developer', 'nightly': 'Nightly'}
return d[release_channel()]

def release_name():
return '{0} Channel'.format(get_channel_display_name())
return '{0} Channel'.format(get_channel_display_name())

def get_tag():
return 'v' + get_version() + get_channel_display_name()
return 'v' + get_version() + get_channel_display_name()

def get_version():
return json.load(open('package.json'))['version']
return json.load(open('package.json'))['version']

def get_releases_by_tag(repo, tag_name, include_drafts=False):
if include_drafts:
return [r for r in repo.releases.get() if r['tag_name'] == tag_name]
else:
return [r for r in repo.releases.get() if r['tag_name'] == tag_name and not r['draft']]
if include_drafts:
return [r for r in repo.releases.get() if r['tag_name'] == tag_name]
else:
return [r for r in repo.releases.get() if r['tag_name'] == tag_name and not r['draft']]
14 changes: 7 additions & 7 deletions tools/test/mock.py
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
# You can obtain one at http://mozilla.org/MPL/2.0/.

class Repo():
def __init__(self):
self.releases = self.Releases()
def __init__(self):
self.releases = self.Releases()

class Releases():
def __init__(self):
self._releases = []
def get(self):
return self._releases
class Releases():
def __init__(self):
self._releases = []
def get(self):
return self._releases
24 changes: 12 additions & 12 deletions tools/test/test_publish.py
Original file line number Diff line number Diff line change
@@ -15,20 +15,20 @@
from mock import Repo

class TestPublishGetDraft(unittest.TestCase):
def setUp(self):
self.repo = Repo()
def setUp(self):
self.repo = Repo()

def test_fails_on_existing_release(self):
self.repo.releases._releases = [{'tag_name': 'test', 'draft': False}]
self.assertRaises(UserWarning, publish_release.get_draft, self.repo, 'test')
def test_fails_on_existing_release(self):
self.repo.releases._releases = [{'tag_name': 'test', 'draft': False}]
self.assertRaises(UserWarning, publish_release.get_draft, self.repo, 'test')

def test_fails_on_no_draft(self):
self.repo.releases._releases = [{'tag_name': 'old', 'draft': False}]
self.assertRaises(UserWarning, publish_release.get_draft, self.repo, 'new')
def test_fails_on_no_draft(self):
self.repo.releases._releases = [{'tag_name': 'old', 'draft': False}]
self.assertRaises(UserWarning, publish_release.get_draft, self.repo, 'new')

def test_succeeds_on_existing_draft(self):
self.repo.releases._releases = [{'tag_name': 'test', 'draft': True}]
publish_release.get_draft(self.repo, 'test')
def test_succeeds_on_existing_draft(self):
self.repo.releases._releases = [{'tag_name': 'test', 'draft': True}]
publish_release.get_draft(self.repo, 'test')

if __name__ == '__main__':
print unittest.main()
print unittest.main()
24 changes: 12 additions & 12 deletions tools/test/test_upload.py
Original file line number Diff line number Diff line change
@@ -16,20 +16,20 @@
from mock import Repo

class TestPublishSanityCheck(unittest.TestCase):
def setUp(self):
self.repo = Repo()
def setUp(self):
self.repo = Repo()

def test_fails_on_existing_draft(self):
self.repo.releases._releases = [{'tag_name': 'test', 'draft': True}]
self.assertRaises(UserWarning, upload.sanity_check, self.repo, 'test')
def test_fails_on_existing_draft(self):
self.repo.releases._releases = [{'tag_name': 'test', 'draft': True}]
self.assertRaises(UserWarning, upload.sanity_check, self.repo, 'test')

def test_fails_on_existing_release(self):
self.repo.releases._releases = [{'tag_name': 'test', 'draft': False}]
self.assertRaises(UserWarning, upload.sanity_check, self.repo, 'test')
def test_fails_on_existing_release(self):
self.repo.releases._releases = [{'tag_name': 'test', 'draft': False}]
self.assertRaises(UserWarning, upload.sanity_check, self.repo, 'test')

def test_succeeds_on_new_release(self):
self.repo.releases._releases = [{'tag_name': 'old', 'draft': False}]
upload.sanity_check(self.repo, 'new')
def test_succeeds_on_new_release(self):
self.repo.releases._releases = [{'tag_name': 'old', 'draft': False}]
upload.sanity_check(self.repo, 'new')

if __name__ == '__main__':
print unittest.main()
print unittest.main()

0 comments on commit 255ba0d

Please sign in to comment.