Pass timeout value to restmail

davehunt · Jul 25, 2012 · d1b0659 · d1b0659
1 parent 0ad877c
commit d1b0659
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/tests/webdriver/base.py b/tests/webdriver/base.py
@@ -36,7 +36,7 @@ def create_verified_user(self, selenium, timeout):
         from ...pages.webdriver.sign_in import SignIn
         signin = SignIn(selenium, timeout, expect='new')
         signin.sign_in_new_user(user.primary_email, user.password)
-        mail = restmail.get_mail(user.id)
+        mail = restmail.get_mail(user.primary_email, timeout=timeout)
         verify_url = re.search(BrowserID.VERIFY_URL_REGEX,
                                mail[0]['text']).group(0)
 

diff --git a/tests/webdriver/check_change_password.py b/tests/webdriver/check_change_password.py
@@ -16,8 +16,7 @@ class TestSignIn(BaseTest):
 
     @pytest.mark.travis
     def test_change_password(self, mozwebqa):
-        user = self.create_verified_user(mozwebqa.selenium,
+        user = self.create_verified_user(mozwebqa.selenium, mozwebqa.timeout)
-                                         mozwebqa.timeout)
 
         mozwebqa.selenium.get(self.browserid_url(mozwebqa.base_url))
         from ...pages.webdriver.account_manager import AccountManager

diff --git a/tests/webdriver/check_reset_password.py b/tests/webdriver/check_reset_password.py
@@ -37,7 +37,9 @@ def test_reset_password(self, mozwebqa):
 
         signin.close_window()
         signin.switch_to_main_window()
-        mail = restmail.get_mail(user.id, message_count=2)
+        mail = restmail.get_mail(user.primary_email,
+                                 message_count=2,
+                                 timeout=mozwebqa.timeout)
         assert 'Click to reset your password' in mail[1]['text']
 
         reset_url = re.search(BrowserID.RESET_URL_REGEX,

diff --git a/tests/webdriver/check_sign_in.py b/tests/webdriver/check_sign_in.py
@@ -43,28 +43,25 @@ def test_sign_in_new_user_helper(self, mozwebqa):
         signin = SignIn(mozwebqa.selenium, mozwebqa.timeout, expect='new')
         print 'signing in as %s' % user.primary_email
         signin.sign_in_new_user(user.primary_email, 'password')
-        mail = restmail.get_mail(user.id)
+        mail = restmail.get_mail(user.primary_email, timeout=mozwebqa.timeout)
         assert 'Click to confirm this email address' in mail[0]['text']
 
     @pytest.mark.travis
     def test_sign_in_new_user(self, mozwebqa):
-        restmail_username = 'bidpom_%s' % uuid.uuid1()
+        user = MockUser()
-        email = '%s@restmail.net' % restmail_username
-        password = 'password'
-
         from ...pages.webdriver.sign_in import SignIn
         signin = SignIn(mozwebqa.selenium, mozwebqa.timeout, expect='new')
-        print 'signing in as %s' % email
+        print 'signing in as %s' % user.primary_email
-        signin.email = email
+        signin.email = user.primary_email
         signin.click_next(expect='verify')
-        signin.password = password
+        signin.password = user.password
-        signin.verify_password = password
+        signin.verify_password = user.password
         signin.click_verify_email()
-        assert signin.check_email_at_address == email
+        assert signin.check_email_at_address == user.primary_email
 
         signin.close_window()
         signin.switch_to_main_window()
-        mail = restmail.get_mail(restmail_username)
+        mail = restmail.get_mail(user.primary_email, timeout=mozwebqa.timeout)
         assert 'Click to confirm this email address' in mail[0]['text']
 
     @pytest.mark.travis