diff --git a/.travis.yml b/.travis.yml index 494605637..6c811bca0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ before_script: script: - cd $TRAVIS_BUILD_DIR && tests/runtests.py -c tests/unittest.conf.travis --assume_yes after_script: - - tail -n 128 /var/tmp/travis/aqtest/quattor/logs/aqd.log + - cat /tmp/fake_dsdb.log + - cat /var/tmp/travis/aqtest/quattor/logs/aqd.log - ls /var/tmp/travis/aqtest/scratch - ls /var/tmp/travis/aqtest/scratch/dsdb_coverage - tail -n 128 /var/tmp/travis/aqtest/scratch/dsdb_coverage/issued_dsdb_cmds diff --git a/tests/broker/brokertest.py b/tests/broker/brokertest.py index b3b6a07a7..c398f0f0c 100755 --- a/tests/broker/brokertest.py +++ b/tests/broker/brokertest.py @@ -702,6 +702,8 @@ def dsdb_expect(self, command, fail=False, errstr=""): filename = DSDB_EXPECT_SUCCESS_FILE expected_name = os.path.join(self.dsdb_coverage_dir, filename) + print expected_name + with open(expected_name, "a") as fp: if isinstance(command, list): fp.write(" ".join(str(cmd) for cmd in command)) diff --git a/tests/fakebin/fake_dsdb b/tests/fakebin/fake_dsdb index 00c0fcd54..e3f85d671 100755 --- a/tests/fakebin/fake_dsdb +++ b/tests/fakebin/fake_dsdb @@ -18,10 +18,15 @@ DATADIR=$(dirname "$0")/dsdb.d if [ -z "$AQTEST_SCRATCHDIR" ]; then exit 0 + echo "WHOOPS" >> /tmp/fake_dsdb.log fi +echo "AQTEST_SCRATCHDIR=$AQTEST_SCRATCHDIR" >> /tmp/fake_dsdb.log + AQTEST_DSDB_COVERAGE_DIR="$AQTEST_SCRATCHDIR/dsdb_coverage" +echo "AQTEST_DSDB_COVERAGE_DIR=$AQTEST_DSDB_COVERAGE_DIR" >> /tmp/fake_dsdb.log + echo "$*" >> "${AQTEST_DSDB_COVERAGE_DIR}/issued_dsdb_cmds" if grep -q "^$*\$" "${AQTEST_DSDB_COVERAGE_DIR}/expected_dsdb_cmds" 2>/dev/null; then