Merge branch 'develop' into win_pepper_cmd

jmarinaro · Mar 6, 2019 · 7c45f40 · 7c45f40
2 parents dbab9da + 4cf0f94
commit 7c45f40
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/pepper/cli.py b/pepper/cli.py
@@ -598,7 +598,7 @@ def login(self, api):
                     logger.error('Login token expired')
                     raise Exception('Login token expired')
             except Exception as e:
-                if e.args[0] is not 2:
+                if e.args[0] != 2:
                     logger.error('Unable to load login token from {0} {1}'.format(token_file, str(e)))
                     if os.path.isfile(token_file):
                         os.remove(token_file)

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -4,6 +4,8 @@ pytest-rerunfailures
 pytest-cov
 git+git://github.com/saltstack/pytest-salt@master#egg=pytest-salt
 tornado<5.0.0
-salt
+salt<2019.2.0
 CherryPy
 setuptools_scm
+pyzmq>=2.2.0,<17.1.0; python_version == '3.4'  # pyzmq 17.1.0 stopped building wheels for python3.4
+pyzmq>=2.2.0; python_version != '3.4'
diff --git a/tests/unit/test_login_details.py b/tests/unit/test_login_details.py
@@ -20,5 +20,5 @@ def test_interactive_logins():
              MagicMock(return_value='pepper')
          ):
         result = pepper.cli.PepperCli().get_login_details()
-    assert result['SALTAPI_USER'] is 'pepper'
-    assert result['SALTAPI_PASS'] is 'pepper'
+    assert result['SALTAPI_USER'] == 'pepper'
+    assert result['SALTAPI_PASS'] == 'pepper'