John Schwinghammer
813f6e6808
Fix 'GPG_1_3_1 referenced before assignment'
...
- Fix gpg.import_key() exception:
"local variable 'GPG_1_3_1' referenced before assignment"
- Update the unit tests to test both the gpg.GPG_1_3_1=True and
gpg.GPG_1_3_1=False cases.
2015-11-19 09:27:46 -06:00
Colton Myers
ed940ad5f5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/gce.py
salt/cloud/clouds/openstack.py
tests/unit/modules/artifactory_test.py
tests/unit/modules/groupadd_test.py
tests/unit/modules/jboss7_test.py
tests/unit/states/jboss7_test.py
2015-08-25 13:55:44 -06:00
Erik Johnson
81a0d4c915
Skip tests that don't work with older mock
...
This fixes test failures on RHEL6 builds.
This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
2015-08-21 21:35:11 -05:00
Colton Myers
99fc7ecb4b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt.7
salt/cloud/__init__.py
salt/fileclient.py
salt/modules/file.py
salt/modules/gpg.py
2015-06-29 16:49:40 -06:00
Gareth J. Greenaway
55eb73b0c9
fixing unit tests.
2015-06-25 11:33:36 -07:00
rallytime
872974aefd
Fully mock GPG mock class to allow gpg_tests to pass
2015-04-16 22:14:47 -06:00
Jayesh Kariya
fd5ee79375
resolved error.
2015-04-10 18:50:15 +05:30
Jayesh Kariya
92040b24bd
adding gpg unit test case.
2015-04-10 18:00:08 +05:30
