Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration
2017-04-04 18:58:19 +01:00
Pedro Algarvio
785698d2ce
Import for the original module
2017-04-04 18:04:38 +01:00
Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins.
...
The adapted config mixin get config methods are not static methods
2017-04-04 17:29:34 +01:00
Pedro Algarvio
5df3054f47
Add minimal documentation about LoaderModuleMockMixin
2017-03-28 19:04:05 +01:00
Pedro Algarvio
7dc11df8ef
Update existing tests documentation.
2017-03-28 19:04:05 +01:00
rallytime
2193cee012
Remove the dev_python26.txt install file
...
Since we're moving to support Python 2.7 and 3.4 in Nitrogen,
we shouldn't need the 2.6 requirements file any longer.
Also updates the doc instructions to use the dev_python34 file
instead of dev_python26, depending on your Python version.
2017-03-06 23:02:17 -07:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup.
2017-03-01 01:33:07 +00:00
rallytime
3f74d697b9
Merge branch '2016.11' into 'develop'
...
Conflicts:
- pkg/windows/build_pkg.bat
- salt/modules/archive.py
2017-01-20 12:07:19 -07:00
rallytime
64d866f7ab
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2017-01-17 11:44:26 -07:00
rallytime
5b43a252c9
Merge branch '2016.11' into 'develop'
...
Conflicts:
- conf/master
- doc/topics/installation/ubuntu.rst
- salt/modules/pillar.py
- salt/netapi/rest_tornado/saltnado.py
- salt/states/influxdb_user.py
- salt/utils/minions.py
- salt/utils/openstack/nova.py
2017-01-17 09:50:06 -07:00
Denys Havrysh
4620dc4afa
DOCS: add C++ compiler installation on RHEL required for bundled 0mq
2017-01-17 15:02:31 +02:00
rallytime
30e8a66fb0
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/netapi/rest_tornado/saltnado.py
- tests/integration/netapi/rest_tornado/test_app.py
2017-01-16 18:54:14 -07:00
Denys Havrysh
b872bb63f6
DOCS: correct examples of running test suite
2017-01-15 11:48:04 +02:00
rallytime
9ad362fbde
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/states/kapacitor.py
2017-01-03 10:17:18 -05:00
twangboy
e96bfe8fa2
Change OSX/OS X to macOS where possible
2016-12-28 14:49:46 -07:00
rallytime
fe1e24909e
Merge branch '2016.11' into 'develop'
...
No conflicts.
2016-12-13 11:29:16 -07:00
rallytime
6a327d1367
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2016-12-13 10:19:47 -07:00
Denys Havrysh
a6098bac1a
Remove note about SaltTesting installation, now it is in the requirements
2016-12-13 11:38:35 +02:00
rallytime
29f45c192c
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/cloud/clouds/ec2.py
- salt/modules/grains.py
2016-12-12 11:23:57 -07:00
rallytime
e31f97cf71
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2016-12-12 10:08:27 -07:00
Denys Havrysh
e9f419ff64
Document the requirements for running ZeroMQ-based integration tests
2016-12-10 22:16:18 +02:00
Mike Place
32e1988b1f
Update index.rst
2016-09-22 13:30:21 +09:00
Mike Place
c54ad1c555
Document salttesting helpers
2016-09-21 23:26:59 +09:00
Erik Johnson
a3442a88ed
Update docs on run_run_plus
2016-09-03 14:59:04 -05: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
f44a0543fe
Fix test example in integration testing docs
...
The example is out of date compared to the actual test it's modeling.
Notably, the self.state_result() function doesn't exist.
2016-06-27 10:22:15 -06:00
Jεan Sacren
e39c3e29b4
Fix trivial grammar and spelling errors in the doc
2016-05-25 00:07:44 -06:00
Mike Place
d5a3e309bf
Event assert ( #33262 )
...
* Initial POC
* Allow the queue to fill by waiting for the lag in IPC
* Add docs
* Add run_tests
* Add reactor to tests
2016-05-19 13:41:23 -06:00
rallytime
40d09c822e
Add some "best practices" information to test documentation
...
Also clarifies some sections and fixes some broken links.
2016-03-28 14:23:42 -06:00
rallytime
06dd2c0411
Fix linking syntax in testing docs
2016-03-16 16:43:53 -06:00
rallytime
beb9d0fe84
Ensure all integration test classes and funcs are documented w/examples
2016-03-04 12:13:27 -07:00
rallytime
7f8ebf7c97
Found another spelling error
2016-03-04 09:53:35 -07:00
rallytime
c8c188535f
Spelling fix
2016-03-04 09:33:37 -07:00
rallytime
f260c51762
Some more testing documentation improvements
2016-03-03 16:57:52 -07:00
rallytime
6ab3961748
Improve Salt Testing tutorial to be a more comprehensive intro
2016-03-02 17:07:57 -07:00
Benjamin Drung
89dcb66310
Fix the wrong "allow to do" phrase
...
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
2015-11-04 12:15:41 +01:00
Nitin Madhok
264f3bf656
Correct spelling of integration in docs
2015-08-12 13:27:30 -04:00
Jacob Hammons
d8d5045d3b
Updates to cloud docs for the provider > driver change in provider configs.
...
Refs #24797
2015-08-10 09:20:26 -06:00
Justin Findlay
f50949e209
revise unit test documentation
2015-03-31 00:40:05 -06:00
Justin Findlay
ad33589fac
move requirements files into requirements dir
2014-12-27 17:29:03 -07:00
Thomas Jackson
fb7e5630d8
Comma cleanup
2014-12-12 11:39:40 -08:00
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Nitin Madhok
5d8ae4e32f
Fixing sphinx violations and errors
2014-11-18 02:53:40 -05:00
Thomas S Hatch
6d38d2db62
Merge branch '2014.7' into develop
...
Conflicts:
salt/utils/__init__.py
2014-11-14 14:38:55 -07:00
Justin Findlay
9158661205
expand unittest docs: formal style, more examples
2014-11-12 16:55:50 -07:00
Justin Findlay
217217f624
wrap unittest doc at 80 chars
2014-11-12 15:59:35 -07:00
Thomas S Hatch
3e204c16f3
Merge branch '2014.7' into develop
2014-09-29 20:07:01 -06:00
rallytime
0b99acc381
Add info about running unittests w/o integration test daemons
2014-09-28 10:52:37 -06:00
Nitin Madhok
6acc5d5198
More
2014-09-16 10:01:50 -04:00
Nitin Madhok
72f3bf8c53
More doc fixes
2014-09-16 09:59:01 -04:00