3 files changed, 23 insertions, 4 deletions
diff --git a/tests/test_docker.c b/tests/test_docker.c
index d60522f..b0cf381 100644
--- a/tests/test_docker.c
+++ b/tests/test_docker.c
@@ -41,7 +41,7 @@ void test_docker_build_and_script_and_save() {
     if (!pushd("test_docker_build")) {
         stasis_testing_write_ascii("Dockerfile", dockerfile_contents);
         STASIS_ASSERT(docker_build(".", "-t test_docker_build", cap_suite.build) == 0, "docker build test failed");
-        STASIS_ASSERT(docker_script("test_docker_build", "uname -a", 0) == 0, "simple docker container script execution failed");
+        STASIS_ASSERT(docker_script("test_docker_build", "--rm", "uname -a", 0) == 0, "simple docker container script execution failed");
         STASIS_ASSERT(docker_save("test_docker_build", ".", STASIS_DOCKER_IMAGE_COMPRESSION) == 0, "saving a simple image failed");
         STASIS_ASSERT(docker_exec("load < test_docker_build.tar.*", 0) == 0, "loading a simple image failed");
         docker_exec("image rm -f test_docker_build", 0);
diff --git a/tests/test_strlist.c b/tests/test_strlist.c
index 47722c0..38343f4 100644
--- a/tests/test_strlist.c
+++ b/tests/test_strlist.c
@@ -200,6 +200,20 @@ void test_strlist_append_tokenize() {
     guard_strlist_free(&list);
 }
 
+void test_strlist_appendf() {
+    const char *fmt = "%c %s %d";
+    struct StrList *list;
+    list = strlist_init();
+    const int len = strlist_appendf(NULL, fmt, 'a', "abc", strlen(fmt));
+    STASIS_ASSERT(strlist_appendf(&list, fmt, 'a', "abc", strlen(fmt)) == len, "length of formatted string should be 7");
+    const char *item = strlist_item(list, 0);
+    STASIS_ASSERT(item != NULL, "valid pointer expected, item should not be NULL");
+    STASIS_ASSERT(strncmp(item, "a", 1) == 0, "first character should be 'a'");
+    STASIS_ASSERT(strncmp(item + 2, "abc", 3) == 0, "string should be 'abc'");
+    STASIS_ASSERT(strncmp(item + 6, "8", 1) == 0, "length of the raw format should be 8");
+    guard_strlist_free(&list);
+}
+
 void test_strlist_copy() {
     struct StrList *list = strlist_init();
     struct StrList *list_copy;
@@ -628,6 +642,7 @@ void test_strlist_item_as_long_double() {
 int main(int argc, char *argv[]) {
     STASIS_TEST_BEGIN_MAIN();
     STASIS_TEST_FUNC *tests[] = {
+        test_strlist_appendf,
         test_strlist_init,
         test_strlist_free,
         test_strlist_append,
diff --git a/tests/test_utils.c b/tests/test_utils.c
index 0e2eb7b..cfe79e0 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -213,17 +213,21 @@ void test_git_clone_and_describe() {
     // test git_describe is functional
     char *taginfo_none = git_describe(".");
     STASIS_ASSERT(taginfo_none != NULL, "should be a git hash, not NULL");
+    puts(taginfo_none);
+    STASIS_ASSERT(is_git_sha(taginfo_none) == true, "not a git hash");
 
     system("git tag -a 1.0.0 -m Mock");
     system("git push --tags origin");
-    char *taginfo = git_describe(".");
+    const char *taginfo = git_describe(".");
+    puts(taginfo);
     STASIS_ASSERT(taginfo != NULL, "should be 1.0.0, not NULL");
-    STASIS_ASSERT(strcmp(taginfo, "1.0.0") == 0, "just-created tag was not described correctly");
+    STASIS_ASSERT(startswith(taginfo, "1.0.0") == true, "just-created tag was not described correctly");
     chdir("..");
 
     char *taginfo_outer = git_describe(repo);
+    puts(taginfo_outer);
     STASIS_ASSERT(taginfo_outer != NULL, "should be 1.0.0, not NULL");
-    STASIS_ASSERT(strcmp(taginfo_outer, "1.0.0") == 0, "just-created tag was not described correctly (out-of-dir invocation)");
+    STASIS_ASSERT(startswith(taginfo_outer, "1.0.0") == true, "just-created tag was not described correctly (out-of-dir invocation)");
 
     char *taginfo_bad = git_describe("abc1234_not_here_or_there");
     STASIS_ASSERT(taginfo_bad == NULL, "a repository that shouldn't exist... exists and has a tag.");