x
/
stackalytics
Code Issues Proposed changes

Synched requirements with the global list 

Fixed assertEquals calls that are marked as errors by new hacking tool.

Note that the sync process is semi-automated since the project depends on
non-standard libs missing in the global list.

Change-Id: Ia6d74919458e6a8ebd22254e368aba357dd8a842
This commit is contained in:
Ilya Shakhat 2013-12-18 17:05:28 +04:00
parent 88aa7ea79e
commit c5f173a744
5 changed files with 92 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
requirements.txt
View File

@ -1,12 +1,12 @@
pbr>=0.5.21,<1.0
Flask>=0.9
Flask>=0.10,<1.0
Flask-Gravatar
iso8601
oslo.config
iso8601>=0.1.8
oslo.config>=1.2.0
paramiko>=1.8.0
psutil<=1.0.1
PyGithub
python-memcached
python-memcached>=1.48
sh
six
six>=1.4.1

16
setup.py
View File

@ -1,7 +1,21 @@
#!/usr/bin/env python
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import setuptools
setuptools.setup(
setup_requires=['pbr>=0.5.21,<1.0'],
setup_requires=['pbr'],
pbr=True)

12
test-requirements.txt
View File

@ -1,13 +1,13 @@
hacking>=0.6,<0.8
hacking>=0.8.0,<0.9
coverage
coverage>=3.6
discover
docutils==0.9.1
fixtures>=0.3.12
jsonschema
mock
fixtures>=0.3.14
jsonschema>=1.3.0,!=1.4.0
mock>=1.0
python-subunit
sphinx>=1.1.2,<1.2
sphinxcontrib-httpdomain
testrepository>=0.0.13
testrepository>=0.0.17
testtools>=0.9.32

90
tests/unit/test_record_processor.py
View File

@ -79,7 +79,7 @@ class TestRecordProcessor(testtools.TestCase):
)
email = 'jdoe@ibm.com'
res = record_processor_inst._get_company_by_email(email)
self.assertEquals('IBM', res)
self.assertEqual('IBM', res)
def test_get_company_by_email_with_long_suffix_mapped(self):
record_processor_inst = self.make_record_processor(
@ -87,7 +87,7 @@ class TestRecordProcessor(testtools.TestCase):
)
email = 'man@mxw.nes.nec.co.jp'
res = record_processor_inst._get_company_by_email(email)
self.assertEquals('NEC', res)
self.assertEqual('NEC', res)
def test_get_company_by_email_with_long_suffix_mapped_2(self):
record_processor_inst = self.make_record_processor(
@ -96,21 +96,21 @@ class TestRecordProcessor(testtools.TestCase):
)
email = 'man@mxw.nes.nec.com'
res = record_processor_inst._get_company_by_email(email)
self.assertEquals('NEC', res)
self.assertEqual('NEC', res)
def test_get_company_by_email_not_mapped(self):
record_processor_inst = self.make_record_processor()
email = 'foo@boo.com'
res = record_processor_inst._get_company_by_email(email)
self.assertEquals(None, res)
self.assertEqual(None, res)
# get_lp_info
def test_get_lp_info_invalid_email(self):
self.read_launchpad.return_value = None
record_processor_inst = self.make_record_processor(users=[])
self.assertEquals((None, None),
record_processor_inst._get_lp_info('error.root'))
self.assertEqual((None, None),
record_processor_inst._get_lp_info('error.root'))
# commit processing
@ -265,8 +265,8 @@ class TestRecordProcessor(testtools.TestCase):
user = utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe')
self.assertIn('johndoe@gmail.com', user['emails'])
self.assertEquals('IBM', user['companies'][0]['company_name'],
message='User affiliation should be updated')
self.assertEqual('IBM', user['companies'][0]['company_name'],
message='User affiliation should be updated')
def test_process_commit_new_user(self):
# User is known to LP, but new to us
@ -291,7 +291,7 @@ class TestRecordProcessor(testtools.TestCase):
user = utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe')
self.assertIn('johndoe@ibm.com', user['emails'])
self.assertEquals('IBM', user['companies'][0]['company_name'])
self.assertEqual('IBM', user['companies'][0]['company_name'])
def test_process_commit_new_user_unknown_to_lb(self):
# User is new to us and not known to LP
@ -314,8 +314,8 @@ class TestRecordProcessor(testtools.TestCase):
user = utils.load_user(
record_processor_inst.runtime_storage_inst, 'johndoe@ibm.com')
self.assertIn('johndoe@ibm.com', user['emails'])
self.assertEquals('IBM', user['companies'][0]['company_name'])
self.assertEquals(None, user['launchpad_id'])
self.assertEqual('IBM', user['companies'][0]['company_name'])
self.assertEqual(None, user['launchpad_id'])
# process records complex scenarios
@ -343,7 +343,7 @@ class TestRecordProcessor(testtools.TestCase):
user = utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe')
self.assertEquals({
self.assertEqual({
'seq': 1,
'user_id': 'john_doe',
'launchpad_id': 'john_doe',
@ -378,7 +378,7 @@ class TestRecordProcessor(testtools.TestCase):
user = utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe')
self.assertEquals({
self.assertEqual({
'seq': 1,
'user_id': 'john_doe',
'launchpad_id': 'john_doe',
@ -430,9 +430,9 @@ class TestRecordProcessor(testtools.TestCase):
'user_name': 'John Doe',
'emails': ['john_doe@gmail.com'],
'companies': [{'company_name': '*independent', 'end_date': 0}]}
self.assertEquals(user, utils.load_user(
self.assertEqual(user, utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe'))
self.assertEquals(user, utils.load_user(
self.assertEqual(user, utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe@gmail.com'))
def test_process_blueprint_then_commit(self):
@ -480,9 +480,9 @@ class TestRecordProcessor(testtools.TestCase):
'user_name': 'John Doe',
'emails': ['john_doe@gmail.com'],
'companies': [{'company_name': '*independent', 'end_date': 0}]}
self.assertEquals(user, utils.load_user(
self.assertEqual(user, utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe'))
self.assertEquals(user, utils.load_user(
self.assertEqual(user, utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe@gmail.com'))
def test_process_review_then_blueprint(self):
@ -528,9 +528,9 @@ class TestRecordProcessor(testtools.TestCase):
'user_name': 'John Doe',
'emails': ['john_doe@gmail.com'],
'companies': [{'company_name': '*independent', 'end_date': 0}]}
self.assertEquals(user, utils.load_user(
self.assertEqual(user, utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe'))
self.assertEquals(user, utils.load_user(
self.assertEqual(user, utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe@gmail.com'))
def test_process_email_then_review(self):
@ -562,9 +562,9 @@ class TestRecordProcessor(testtools.TestCase):
'user_name': 'John Doe',
'emails': ['john_doe@gmail.com'],
'companies': [{'company_name': '*independent', 'end_date': 0}]}
self.assertEquals(user, utils.load_user(
self.assertEqual(user, utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe@gmail.com'))
self.assertEquals(user, utils.load_user(
self.assertEqual(user, utils.load_user(
record_processor_inst.runtime_storage_inst, 'john_doe'))
def test_merge_users(self):
@ -608,20 +608,20 @@ class TestRecordProcessor(testtools.TestCase):
'emails': ['john_doe@ibm.com'],
'companies': [{'company_name': 'IBM', 'end_date': 0}]}
runtime_storage_inst = record_processor_inst.runtime_storage_inst
self.assertEquals(2, runtime_storage_inst.get_by_key('user:count'))
self.assertEquals(None, utils.load_user(runtime_storage_inst, 1))
self.assertEquals(user, utils.load_user(runtime_storage_inst, 2))
self.assertEquals(user, utils.load_user(runtime_storage_inst,
'john_doe'))
self.assertEquals(user, utils.load_user(runtime_storage_inst,
'john_doe@ibm.com'))
self.assertEqual(2, runtime_storage_inst.get_by_key('user:count'))
self.assertEqual(None, utils.load_user(runtime_storage_inst, 1))
self.assertEqual(user, utils.load_user(runtime_storage_inst, 2))
self.assertEqual(user, utils.load_user(runtime_storage_inst,
'john_doe'))
self.assertEqual(user, utils.load_user(runtime_storage_inst,
'john_doe@ibm.com'))
# all records should have the same user_id and company name
for record in runtime_storage_inst.get_all_records():
self.assertEquals('john_doe', record['user_id'],
message='Record %s' % record['primary_key'])
self.assertEquals('IBM', record['company_name'],
message='Record %s' % record['primary_key'])
self.assertEqual('john_doe', record['user_id'],
message='Record %s' % record['primary_key'])
self.assertEqual('IBM', record['company_name'],
message='Record %s' % record['primary_key'])
def test_core_user_guess(self):
record_processor_inst = self.make_record_processor(
@ -682,10 +682,10 @@ class TestRecordProcessor(testtools.TestCase):
'companies': [{'company_name': '*independent',
'end_date': 0}]}
runtime_storage_inst = record_processor_inst.runtime_storage_inst
self.assertEquals(user_1, utils.load_user(runtime_storage_inst,
'john_doe'))
self.assertEquals(user_2, utils.load_user(runtime_storage_inst,
'homer'))
self.assertEqual(user_1, utils.load_user(runtime_storage_inst,
'john_doe'))
self.assertEqual(user_2, utils.load_user(runtime_storage_inst,
'homer'))
# record post-processing
@ -722,12 +722,12 @@ class TestRecordProcessor(testtools.TestCase):
record_processor_inst.finalize()
bp1 = runtime_storage_inst.get_by_primary_key('bpd:mod:blueprint')
self.assertEquals(2, bp1['mention_count'])
self.assertEquals(1234567895, bp1['mention_date'])
self.assertEqual(2, bp1['mention_count'])
self.assertEqual(1234567895, bp1['mention_date'])
bp2 = runtime_storage_inst.get_by_primary_key('bpd:mod:ignored')
self.assertEquals(0, bp2['mention_count'])
self.assertEquals(0, bp2['mention_date'])
self.assertEqual(0, bp2['mention_count'])
self.assertEqual(0, bp2['mention_date'])
email = runtime_storage_inst.get_by_primary_key('<another-message-id>')
self.assertTrue('mod:blueprint' in email['blueprint_id'])
@ -758,10 +758,10 @@ class TestRecordProcessor(testtools.TestCase):
record_processor_inst.finalize()
review1 = runtime_storage_inst.get_by_primary_key('I111')
self.assertEquals(2, review1['review_number'])
self.assertEqual(2, review1['review_number'])
review2 = runtime_storage_inst.get_by_primary_key('I222')
self.assertEquals(1, review2['review_number'])
self.assertEqual(1, review2['review_number'])
def test_mark_disagreement(self):
record_processor_inst = self.make_record_processor(
@ -887,7 +887,7 @@ class TestRecordProcessor(testtools.TestCase):
updated = list(record_processor_inst.update(commit_generator,
release_index))
self.assertEquals(0, len(updated))
self.assertEqual(0, len(updated))
# mail processing
@ -1069,8 +1069,8 @@ class TestRecordProcessor(testtools.TestCase):
def assertRecordsMatch(self, expected, actual):
for key, value in expected.iteritems():
self.assertEquals(value, actual[key],
'Values for key %s do not match' % key)
self.assertEqual(value, actual[key],
'Values for key %s do not match' % key)
# Helpers

42
tests/unit/test_vcs.py
View File

@ -102,29 +102,29 @@ diff_stat:
'''
commits = list(self.git.log('dummy', 'dummy'))
self.assertEquals(5, len(commits))
self.assertEqual(5, len(commits))
self.assertEquals(21, commits[0]['files_changed'])
self.assertEquals(340, commits[0]['lines_added'])
self.assertEquals(408, commits[0]['lines_deleted'])
self.assertEquals(['1167901'], commits[0]['bug_id'])
self.assertEqual(21, commits[0]['files_changed'])
self.assertEqual(340, commits[0]['lines_added'])
self.assertEqual(408, commits[0]['lines_deleted'])
self.assertEqual(['1167901'], commits[0]['bug_id'])
self.assertEquals(1, commits[1]['files_changed'])
self.assertEquals(0, commits[1]['lines_added'])
self.assertEquals(1, commits[1]['lines_deleted'])
self.assertEqual(1, commits[1]['files_changed'])
self.assertEqual(0, commits[1]['lines_added'])
self.assertEqual(1, commits[1]['lines_deleted'])
self.assertEquals(1, commits[2]['files_changed'])
self.assertEquals(8, commits[2]['lines_added'])
self.assertEquals(0, commits[2]['lines_deleted'])
self.assertEquals(set(['987654', '1234567']),
set(commits[2]['bug_id']))
self.assertEqual(1, commits[2]['files_changed'])
self.assertEqual(8, commits[2]['lines_added'])
self.assertEqual(0, commits[2]['lines_deleted'])
self.assertEqual(set(['987654', '1234567']),
set(commits[2]['bug_id']))
self.assertEquals(0, commits[3]['files_changed'])
self.assertEquals(0, commits[3]['lines_added'])
self.assertEquals(0, commits[3]['lines_deleted'])
self.assertEquals(set(['dummy:fix-me']),
set(commits[3]['blueprint_id']))
self.assertEqual(0, commits[3]['files_changed'])
self.assertEqual(0, commits[3]['lines_added'])
self.assertEqual(0, commits[3]['lines_deleted'])
self.assertEqual(set(['dummy:fix-me']),
set(commits[3]['blueprint_id']))
self.assertEquals(0, commits[4]['files_changed'])
self.assertEquals(0, commits[4]['lines_added'])
self.assertEquals(0, commits[4]['lines_deleted'])
self.assertEqual(0, commits[4]['files_changed'])
self.assertEqual(0, commits[4]['lines_added'])
self.assertEqual(0, commits[4]['lines_deleted'])