Skip to content

working on DB tests #1666

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

Closed
wants to merge 2 commits into from
Closed

working on DB tests #1666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3217bce
initial commit
antgonza Feb 26, 2016
c234b83
returning to old tests
antgonza Feb 26, 2016
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
33 changes: 0 additions & 33 deletions qiita_db/test/test_artifact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,20 +368,6 @@ def test_delete_error_running_job(self):
with self.assertRaises(qdb.exceptions.QiitaDBArtifactDeletionError):
qdb.artifact.Artifact.delete(test.id)

def test_delete(self):
test = qdb.artifact.Artifact.create(
self.filepaths_root, "FASTQ", prep_template=self.prep_template)

uploads_fp = join(qdb.util.get_mountpoint("uploads")[0][1],
str(test.study.id))
self._clean_up_files.extend(
[join(uploads_fp, basename(fp)) for _, fp, _ in test.filepaths])

qdb.artifact.Artifact.delete(test.id)

with self.assertRaises(qdb.exceptions.QiitaDBUnknownIDError):
qdb.artifact.Artifact(test.id)

def test_delete_with_jobs(self):
test = qdb.artifact.Artifact.create(
self.filepaths_root, "FASTQ", prep_template=self.prep_template)
Expand Down Expand Up @@ -411,12 +397,6 @@ def test_delete_with_jobs(self):
with self.assertRaises(qdb.exceptions.QiitaDBUnknownIDError):
qdb.processing_job.ProcessingJob(job.id)

def test_name(self):
self.assertEqual(qdb.artifact.Artifact(1).name, "Raw data 1")
self.assertEqual(qdb.artifact.Artifact(2).name, "Demultiplexed 1")
self.assertEqual(qdb.artifact.Artifact(3).name, "Demultiplexed 2")
self.assertEqual(qdb.artifact.Artifact(4).name, "BIOM")

def test_name_setter(self):
a = qdb.artifact.Artifact(1)
self.assertEqual(a.name, "Raw data 1")
Expand Down Expand Up @@ -463,9 +443,6 @@ def test_processing_parameters(self):
'barcode_type': 'golay_12'})
self.assertEqual(obs, exp)

def test_visibility(self):
self.assertEqual(qdb.artifact.Artifact(1).visibility, "private")

def test_visibility_setter(self):
a = qdb.artifact.Artifact.create(
self.filepaths_root, "FASTQ", prep_template=self.prep_template)
Expand Down Expand Up @@ -605,16 +582,6 @@ def test_is_submitted_to_vamps_setter(self):
a.is_submitted_to_vamps = True
self.assertTrue(a.is_submitted_to_vamps)

def test_filepaths(self):
db_test_raw_dir = qdb.util.get_mountpoint('raw_data')[0][1]
path_builder = partial(join, db_test_raw_dir)
exp_fps = [
(1, path_builder('1_s_G1_L001_sequences.fastq.gz'),
"raw_forward_seqs"),
(2, path_builder('1_s_G1_L001_sequences_barcodes.fastq.gz'),
"raw_barcodes")]
self.assertEqual(qdb.artifact.Artifact(1).filepaths, exp_fps)

def test_parents(self):
self.assertEqual(qdb.artifact.Artifact(1).parents, [])

Expand Down
76 changes: 6 additions & 70 deletions qiita_db/test/test_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,15 @@ def setUp(self):
'user_verify_code': None
}

def _check_pass(self, passwd):
obspass = self.conn_handler.execute_fetchone(
"SELECT password FROM qiita.qiita_user WHERE email = %s",
(self.user.id, ))[0]
self.assertEqual(qdb.util.hash_password(passwd, obspass), obspass)

def tearDown(self):
qiita_config.portal = self.portal

def test_instantiate_user(self):
qdb.user.User('admin@foo.bar')

def test_instantiate_unknown_user(self):
with self.assertRaises(qdb.exceptions.QiitaDBUnknownIDError):
qdb.user.User('FAIL@OMG.bar')
Expand All @@ -96,26 +99,6 @@ def _check_correct_info(self, obs, exp):
else:
self.assertEqual(obs[key], exp[key])

def test_create_user(self):
user = qdb.user.User.create('new@test.bar', 'password')
self.assertEqual(user.id, 'new@test.bar')
sql = "SELECT * from qiita.qiita_user WHERE email = 'new@test.bar'"
obs = self.conn_handler.execute_fetchall(sql)
self.assertEqual(len(obs), 1)
obs = dict(obs[0])
exp = {
'password': '',
'name': None,
'pass_reset_timestamp': None,
'affiliation': None,
'pass_reset_code': None,
'phone': None,
'user_verify_code': '',
'address': None,
'user_level_id': 5,
'email': 'new@test.bar'}
self._check_correct_info(obs, exp)

def test_create_user_info(self):
user = qdb.user.User.create('new@test.bar', 'password', self.userinfo)
self.assertEqual(user.id, 'new@test.bar')
Expand Down Expand Up @@ -190,19 +173,6 @@ def test_get_email(self):
def test_get_level(self):
self.assertEqual(self.user.level, "admin")

def test_get_info(self):
expinfo = {
'name': 'Admin',
'affiliation': 'Owner University',
'address': '312 noname st, Apt K, Nonexistantown, CO 80302',
'phone': '222-444-6789',
'pass_reset_code': None,
'pass_reset_timestamp': None,
'user_verify_code': None,
'phone': '222-444-6789'
}
self.assertEqual(self.user.info, expinfo)

def test_set_info(self):
self.user.info = self.userinfo
self.assertEqual(self.user.info, self.userinfo)
Expand Down Expand Up @@ -311,12 +281,6 @@ def test_verify_code(self):
m_id = qdb.util.get_count('qiita.message')
self.assertEqual(self.conn_handler.execute_fetchall(sql), [[m_id]])

def _check_pass(self, passwd):
obspass = self.conn_handler.execute_fetchone(
"SELECT password FROM qiita.qiita_user WHERE email = %s",
(self.user.id, ))[0]
self.assertEqual(qdb.util.hash_password(passwd, obspass), obspass)

def test_change_pass(self):
self.user._change_pass("newpassword")
self._check_pass("newpassword")
Expand Down Expand Up @@ -362,34 +326,6 @@ def test_change_forgot_password_bad_code(self):
self.assertEqual(obsbool, False)
self._check_pass("password")

def test_messages(self):
qdb.util.add_system_message('SYS MESSAGE', datetime.now())
user = qdb.user.User('test@foo.bar')
obs = user.messages()
exp_msg = [
(4, 'SYS MESSAGE'),
(1, 'message 1'),
(2, 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. '
'Pellentesque sed auctor ex, non placerat sapien. Vestibulum '
'vestibulum massa ut sapien condimentum, cursus consequat diam'
' sodales. Nulla aliquam arcu ut massa auctor, et vehicula '
'mauris tempor. In lacinia viverra ante quis pellentesque. '
'Nunc vel mi accumsan, porttitor eros ut, pharetra elit. Nulla'
' ac nisi quis dui egestas malesuada vitae ut mauris. Morbi '
'blandit non nisl a finibus. In erat velit, congue at ipsum '
'sit amet, venenatis bibendum sem. Curabitur vel odio sed est '
'rutrum rutrum. Quisque efficitur ut purus in ultrices. '
'Pellentesque eu auctor justo.'),
(3, 'message <a href="#">3</a>')]
self.assertEqual([(x[0], x[1]) for x in obs], exp_msg)
self.assertTrue(all(x[2] < datetime.now() for x in obs))
self.assertFalse(all(x[3] for x in obs))
self.assertEqual([x[4] for x in obs], [True, False, False, False])

obs = user.messages(1)
exp_msg = ['SYS MESSAGE']
self.assertEqual([x[1] for x in obs], exp_msg)

def test_mark_messages(self):
user = qdb.user.User('test@foo.bar')
user.mark_messages([1, 2])
Expand Down