rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-19 09:22:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2064 from SvenDowideit/fix-integration-tests

Browse Source 
Fix integration tests
This commit is contained in:
Sven Dowideit
2017-08-29 12:08:28 +10:00
committed by GitHub
parent 40148d227f abc00e7ca9
commit 6433676991
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -49,7 +49,7 @@ release-build:
itest: itest:
mkdir -p dist mkdir -p dist
./.dapper integration-test 2>&1 | tee dist/itest.log ./.dapper integration-test 2>&1 | tee dist/itest.log
grep FAIL dist/itest.log || true grep --binary-files=text FAIL dist/itest.log || true
qcows: qcows:
cp dist/artifacts/rancheros.iso scripts/images/openstack/ cp dist/artifacts/rancheros.iso scripts/images/openstack/

2
tests/assets/test_25/cloud-config.yml
View File

@@ -2,6 +2,6 @@
rancher: rancher:
console: debian console: debian
docker: docker:
engine: docker-17.06.0-ce engine: docker-17.06.1-ce
ssh_authorized_keys: ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF

3
tests/common_test.go
View File

@@ -50,6 +50,7 @@ func (s *QemuSuite) TearDownTest(c *C) {
if s.qemuCmd != nil { if s.qemuCmd != nil {
s.Stop(c) s.Stop(c)
} }
time.Sleep(time.Second)
} }
// RunQemuWith requires user to specify all the `scripts/run` arguments // RunQemuWith requires user to specify all the `scripts/run` arguments
@@ -252,7 +253,7 @@ func (s *QemuSuite) Stop(c *C) {
c.Assert(s.qemuCmd.Process.Kill(), IsNil) c.Assert(s.qemuCmd.Process.Kill(), IsNil)
fmt.Printf("%s: stopping qemu 3\n", c.TestName()) fmt.Printf("%s: stopping qemu 3\n", c.TestName())
s.qemuCmd.Process.Wait() s.qemuCmd.Process.Wait()
//time.Sleep(time.Millisecond * 1000) time.Sleep(time.Second)
s.qemuCmd = nil s.qemuCmd = nil
fmt.Printf("--- %s: qemu stopped", c.TestName()) fmt.Printf("--- %s: qemu stopped", c.TestName())
} }

4
tests/custom_docker_test.go
View File

@@ -43,8 +43,8 @@ func (s *QemuSuite) TestCustomDockerInPersistentConsole(c *C) {
set -ex set -ex
apt-get --version apt-get --version
docker version | grep 17.06.0-ce docker version | grep 17.06.1-ce
sudo ros engine list | grep 17.06.0-ce | grep current sudo ros engine list | grep 17.06.1-ce | grep current
docker run -d --restart=always nginx docker run -d --restart=always nginx
docker ps | grep nginx`) docker ps | grep nginx`)