Commit Graph

17 Commits

Author SHA1 Message Date
rallytime
9f5e275f2e When writing strings to tmp files, use bytes for Python 3 2016-07-11 16:07:35 -06:00
rallytime
cc83fa151a Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
2016-06-28 17:34:27 -06:00
rallytime
c87a108a12 Don't forget the pylint disables for range 2016-06-28 16:52:37 -06:00
rallytime
359e8ca2ce Pylint fixes 2016-06-28 16:04:47 -06:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
2016-04-26 14:42:26 -06:00
Justin Anderson
f6861768f4 Skipping boto test on OpenSuse (#32624) 2016-04-18 09:57:51 -06:00
Justin Anderson
22ef15e9b7 Fixed boto_lambda_test
VpcConfig was not added to function_ret, which was causing
test_that_when_describing_function_it_returns_the_dict_of_properties_returns_true
to fail.
2016-03-29 16:32:57 -06:00
Justin Anderson
f8080b8e59 Re-enable some skipped Boto tests 2016-03-24 10:30:48 -06:00
Kris Raney
3c6d0e8fc1 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-22 14:49:18 -06:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -06:00
Pedro Algarvio
cb196803fd
Skip boto tests which are pegging CPU and eating all available RAM. 2016-03-17 01:01:24 +00:00
Kris Raney
c024ca70b1 A few missed lint errors 2015-12-09 16:52:10 -06:00
Kris Raney
4e04c3fbbd Fix lint warnings, add log when using default region 2015-12-09 16:03:20 -06:00
Kris Raney
bda53f74a4 Full unit test coverage for lambda module 2015-12-08 13:33:28 -06:00
Kris Raney
f98791054e Lambda function unit test cases 2015-12-08 10:15:11 -06:00
Kris Raney
be58e095d4 Avoid leaving zip files scattered around after tests. 2015-12-04 14:23:40 -06:00
Kris Raney
6a208dca84 Start unit tests for boo_lambda 2015-12-03 21:09:48 -06:00