Commit Graph

2278 Commits

Author SHA1 Message Date
Nicole Thomas
2a3df50223 Merge pull request #34724 from rallytime/test-fix-34270
Update mock value to match change in #34270.
2016-07-16 14:06:04 -06:00
rallytime
f667b936e5 Update mock value to match change in #34270.
Fixes the failing test in #34270
2016-07-16 14:03:37 -06:00
Mike Place
1b3742c41b Merge pull request #34599 from meaksh/salt-snapper-module
Snapper execution module and state for Salt
2016-07-16 13:43:06 -06:00
Mike Place
e918aba3c3 Merge pull request #34704 from babilen/influxdb-current
Influxdb current
2016-07-16 12:39:22 -06:00
Wolodja Wentland
87b54170aa Rename InfluxDB states and modules for 0.8
InfluxDB versions newer than 0.8 introduced significant changes in
database concepts, user administration and Python API.

We therefore decided to rename the old InfluxDB states to 'influxdb08*'
and to reserve the 'influxdb' name for InfluxDB 0.9+ compatible states
and modules.
2016-07-16 09:46:44 +02:00
Mike Place
b11fd8ef6a Merge pull request #34484 from dmacvicar/docker_images
[WIP] Creating Docker images with pure Salt and running Salt commands inside containers
2016-07-15 16:17:59 -06:00
Bo Maryniuk
e5c3195fa3 Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:14:27 +02:00
rallytime
bb2c43b52a Merge branch '2016.3' into 'develop'
No conflicts.
2016-07-14 14:10:10 -06:00
Mike Place
eadae09e0a Merge pull request #34563 from rallytime/py3-state-unit-tests
Py3 fixes for running unit tests in the unit/states/ directory.
2016-07-14 08:28:49 -06:00
Anthony Shaw
7786c0020c Libcloud DNS module fix (#34628)
* add test module

* add broken test

* fix typo in config dictionary

* remove call to unused function, add called_with assertion
2016-07-13 11:47:20 -04:00
Justin Anderson
445f8afc69 Fixes failing test on Suse Leap (#34621) 2016-07-12 18:48:06 -04:00
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
2016-07-12 14:29:35 -06:00
Justin Anderson
7dd8035c62 Gate docker unit test to check for docker (#34591)
* Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
2016-07-12 13:33:31 -04:00
Pablo Suárez Hernández
c00991bc1e Fix for pylint: W1699 2016-07-12 15:38:28 +01:00
Pablo Suárez Hernández
5213ddeab9 Fix in inline comments 2016-07-12 15:10:25 +01:00
Duncan Mac-Vicar P
b60f76b836 pylint: W1699(incompatible-py3-code) 2016-07-12 15:44:01 +02:00
Pablo Suárez Hernández
867bfbf353 Variable renaming. Pylint fixes 2016-07-12 14:03:52 +01:00
Duncan Mac-Vicar P
cfdb1c3928 typo 2016-07-12 14:38:22 +02:00
Duncan Mac-Vicar P
1f77336a1d test that fix /tmp is not used 2016-07-12 14:37:47 +02:00
Pablo Suárez Hernández
5c06e91417 pylint: some fixes 2016-07-12 12:24:04 +01:00
Pablo Suárez Hernández
39e8ff0f25 pylint fixes 2016-07-12 11:03:09 +01:00
Pablo Suárez Hernández
0a9dbfc33a unit test for snapper.diff with binary file 2016-07-12 09:02:31 +01:00
rallytime
9f5e275f2e When writing strings to tmp files, use bytes for Python 3 2016-07-11 16:07:35 -06:00
rallytime
e6f875cd62 Remove izip import from unit.modules.boto_apigateway_test.py
Use six compatible version of zip instead
2016-07-11 14:26:06 -06:00
Pablo Suárez Hernández
964d5cbf03 fix diff unit test while creating text file 2016-07-11 16:15:11 +01:00
Pablo Suarez Hernandez
f77551b883 more unit tests 2016-07-11 16:47:49 +02:00
rallytime
c539333924 Use six.moves.StringIO() 2016-07-08 09:30:58 -06:00
rallytime
1f4a75f268 Move StringIO import to use six for tests.unit.modules.zypper_test.py 2016-07-07 19:27:30 -06:00
Duncan Mac-Vicar P
59d8ce480e implement keyword arguments for dockerng.call 2016-07-06 14:11:17 +02:00
Duncan Mac-Vicar P
d3ee81c561 testcase for call 2016-07-06 11:49:39 +02:00
Bo Maryniuk
d1c2d5aaaa Lintfix 2016-07-06 10:09:14 +02:00
Bo Maryniuk
88ab5f4755 Fix Python3 compat (StringIO) 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f1d0961e69 Fix boolean comparison 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f275378e24 Add unit test for update an object 2016-07-06 10:09:14 +02:00
Bo Maryniuk
6174f4ad4a Fix imports 2016-07-06 10:09:14 +02:00
Bo Maryniuk
bf9ba65489 Add unit test for deleting objects 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1ce88be0ef Add unit test for criteria matcher 2016-07-06 10:09:14 +02:00
Bo Maryniuk
a20019d859 Add unit test for "matches" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
844eefd758 Add unit test for "less than" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
fac88ac41b Add unit test for "equals" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
1dfe81bfe6 Add unit test for "more than" criteria selector 2016-07-06 10:09:14 +02:00
Bo Maryniuk
99848659c9 Add unit test on getting objects 2016-07-06 10:09:14 +02:00
Bo Maryniuk
bc1a8b7e45 Accept content in Writer 2016-07-06 10:09:14 +02:00
Bo Maryniuk
c4c2ac7e70 Add object storing unit test 2016-07-06 10:09:14 +02:00
Bo Maryniuk
8e537ccc9e Reset data in Writable 2016-07-06 10:09:14 +02:00
Bo Maryniuk
c744aa1caf Add unit test for database listing 2016-07-06 10:09:14 +02:00
Bo Maryniuk
f7dc2b9c84 Add unit test for object validation 2016-07-06 10:09:14 +02:00
Bo Maryniuk
234e342aa7 Add unit test for object serialization 2016-07-06 10:09:14 +02:00
Bo Maryniuk
0a177297f4 Rename Writable class 2016-07-06 10:09:14 +02:00