ソースを参照

fix test/integration/test-apt-ftparchive-cachedb-lp1274466 in travis

Michael Vogt 12 年 前
コミット
ea606ec43a
共有2 個のファイルを変更した5 個の追加5 個の削除を含む
  1. 1 1
      .travis.yml
  2. 4 4
      test/integration/test-apt-ftparchive-cachedb-lp1274466

+ 1 - 1
.travis.yml

@@ -2,5 +2,5 @@ language: cpp
 before_install:
 before_install:
  - sudo apt-get update -q
  - sudo apt-get update -q
  - sudo ./prepare-release travis-ci
  - sudo ./prepare-release travis-ci
- - sudo apt-get install -q --no-install-recommends stunnel4
+ - sudo apt-get install -q --no-install-recommends stunnel4 db-util
 script: make && make test && test/integration/run-tests
 script: make && make test && test/integration/run-tests

+ 4 - 4
test/integration/test-apt-ftparchive-cachedb-lp1274466

@@ -12,7 +12,7 @@ configarchitecture "i386"
 
 
 # gather the db and the deb, ensure mtime is not modfied as its saved in the DB
 # gather the db and the deb, ensure mtime is not modfied as its saved in the DB
 cp -p $TESTDIR/deb-lp1274466-cachedb.deb  foo_1_i386.deb
 cp -p $TESTDIR/deb-lp1274466-cachedb.deb  foo_1_i386.deb
-cp $TESTDIR/cachedb-lp1274466-old-format.db old-format.db
+cp -p $TESTDIR/cachedb-lp1274466-old-format.db old-format.db
 
 
 # verify that the format is different
 # verify that the format is different
 testsuccess aptftparchive --db new-format.db packages .
 testsuccess aptftparchive --db new-format.db packages .
@@ -45,7 +45,7 @@ Description: an autogenerated dummy foo=1/test
  und used only by testcases and surf no other propose…
  und used only by testcases and surf no other propose…
 " aptftparchive  --db old-format.db packages .
 " aptftparchive  --db old-format.db packages .
 
 
-# ensure that the db is updated
-db_dump old-format.db > old-format.dump
-testsuccess diff -u old-format.dump new-format.dump
+# ensure that the db is updated and contains the new sha512
+testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump
+