vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-05-07 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

fix unit tests on arm

Browse Source 
and fix etcd data dir
This commit is contained in:
André Roth
2024-12-03 20:05:45 +08:00
parent 280563caa8
commit e92afd8f78
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -2
View File
@@ -86,12 +86,12 @@ install:
test: prepare swagger etcd-install ## Run unit tests test: prepare swagger etcd-install ## Run unit tests
@echo "\e[33m\e[1mStarting etcd ...\e[0m" @echo "\e[33m\e[1mStarting etcd ...\e[0m"
@mkdir -p /tmp/etcd-data; system/t13_etcd/start-etcd.sh > /tmp/etcd-data/etcd.log 2>&1 & @mkdir -p /tmp/aptly-etcd-data; system/t13_etcd/start-etcd.sh > /tmp/aptly-etcd-data/etcd.log 2>&1 &
@echo "\e[33m\e[1mRunning go test ...\e[0m" @echo "\e[33m\e[1mRunning go test ...\e[0m"
go test -v ./... -gocheck.v=true -coverprofile=unit.out; echo $$? > .unit-test.ret go test -v ./... -gocheck.v=true -coverprofile=unit.out; echo $$? > .unit-test.ret
@echo "\e[33m\e[1mStopping etcd ...\e[0m" @echo "\e[33m\e[1mStopping etcd ...\e[0m"
@pid=`cat /tmp/etcd.pid`; kill $$pid @pid=`cat /tmp/etcd.pid`; kill $$pid
@rm -f /tmp/etcd-data/etcd.log @rm -f /tmp/aptly-etcd-data/etcd.log
@ret=`cat .unit-test.ret`; if [ "$$ret" = "0" ]; then echo "\n\e[32m\e[1mUnit Tests SUCCESSFUL\e[0m"; else echo "\n\e[31m\e[1mUnit Tests FAILED\e[0m"; fi; rm -f .unit-test.ret; exit $$ret @ret=`cat .unit-test.ret`; if [ "$$ret" = "0" ]; then echo "\n\e[32m\e[1mUnit Tests SUCCESSFUL\e[0m"; else echo "\n\e[31m\e[1mUnit Tests FAILED\e[0m"; fi; rm -f .unit-test.ret; exit $$ret
system-test: prepare swagger etcd-install ## Run system tests system-test: prepare swagger etcd-install ## Run system tests
files/package_pool_test.go
+3 -3
View File
@@ -120,7 +120,7 @@ func (s *PackagePoolSuite) TestImportOk(c *C) {
if isSameDevice(s) { if isSameDevice(s) {
c.Check(info.Sys().(*syscall.Stat_t).Nlink > 1, Equals, true) c.Check(info.Sys().(*syscall.Stat_t).Nlink > 1, Equals, true)
} else { } else {
c.Check(info.Sys().(*syscall.Stat_t).Nlink, Equals, uint64(1)) c.Check(info.Sys().(*syscall.Stat_t).Nlink == 1, Equals, true)
} }
// import as different name // import as different name
@@ -359,7 +359,7 @@ func (s *PackagePoolSuite) TestLink(c *C) {
if isSameDevice(s) { if isSameDevice(s) {
c.Check(info.Sys().(*syscall.Stat_t).Nlink > 2, Equals, true) c.Check(info.Sys().(*syscall.Stat_t).Nlink > 2, Equals, true)
} else { } else {
c.Check(info.Sys().(*syscall.Stat_t).Nlink, Equals, uint64(2)) c.Check(info.Sys().(*syscall.Stat_t).Nlink == 2, Equals, true)
} }
} }
@@ -377,7 +377,7 @@ func (s *PackagePoolSuite) TestSymlink(c *C) {
if isSameDevice(s) { if isSameDevice(s) {
c.Check(info.Sys().(*syscall.Stat_t).Nlink > 2, Equals, true) c.Check(info.Sys().(*syscall.Stat_t).Nlink > 2, Equals, true)
} else { } else {
c.Check(info.Sys().(*syscall.Stat_t).Nlink, Equals, uint64(1)) c.Check(info.Sys().(*syscall.Stat_t).Nlink == 1, Equals, true)
} }
info, err = os.Lstat(dstPath) info, err = os.Lstat(dstPath)
system/lib.py
+2 -2
View File
@@ -253,8 +253,8 @@ class BaseTest(object):
self.shutdown_etcd() self.shutdown_etcd()
# remove existing database # remove existing database
if os.path.exists("/tmp/etcd-data"): if os.path.exists("/tmp/aptly-etcd-data"):
shutil.rmtree("/tmp/etcd-data") shutil.rmtree("/tmp/aptly-etcd-data")
if self.fixtureDB: if self.fixtureDB:
print("import etcd") print("import etcd")