Merge conflicts - integration into pytest
Showing
- .gitattributes 3 additions, 1 deletion.gitattributes
- .githooks/post-commit 4 additions, 0 deletions.githooks/post-commit
- .gitignore 3 additions, 3 deletions.gitignore
- .gitlab-ci.yml 34 additions, 7 deletions.gitlab-ci.yml
- MANIFEST.in 2 additions, 0 deletionsMANIFEST.in
- Vagrantfile 15 additions, 8 deletionsVagrantfile
- clmctest/__init__.py 0 additions, 0 deletionsclmctest/__init__.py
- clmctest/inputs/__init__.py 0 additions, 0 deletionsclmctest/inputs/__init__.py
- clmctest/inputs/conftest.py 5 additions, 3 deletionsclmctest/inputs/conftest.py
- clmctest/inputs/rspec.yml 17 additions, 12 deletionsclmctest/inputs/rspec.yml
- clmctest/inputs/test_rspec.py 0 additions, 0 deletionsclmctest/inputs/test_rspec.py
- clmctest/inputs/test_telegraf_agents.py 0 additions, 0 deletionsclmctest/inputs/test_telegraf_agents.py
- clmctest/monitoring/LineProtocolGenerator.py 0 additions, 0 deletionsclmctest/monitoring/LineProtocolGenerator.py
- clmctest/monitoring/StreamingSim.py 1 addition, 1 deletionclmctest/monitoring/StreamingSim.py
- clmctest/monitoring/__init__.py 0 additions, 0 deletionsclmctest/monitoring/__init__.py
- clmctest/monitoring/conftest.py 7 additions, 3 deletionsclmctest/monitoring/conftest.py
- clmctest/monitoring/rspec.yml 8 additions, 3 deletionsclmctest/monitoring/rspec.yml
- clmctest/monitoring/test_rspec.py 0 additions, 0 deletionsclmctest/monitoring/test_rspec.py
- clmctest/monitoring/test_simresults.py 1 addition, 1 deletionclmctest/monitoring/test_simresults.py
- clmctest/scripts/.pytest_cache/v/cache/lastfailed 3 additions, 0 deletionsclmctest/scripts/.pytest_cache/v/cache/lastfailed
Loading
Please register or sign in to comment