Merge branch 'full-code-coverage-report-for-master' into 'master'

Full code coverage report for master See merge request eriknellessen/encrypting-cloud-storages!7
eriknellessen · Jan 18, 2022 · c0b9ee9 · c0b9ee9
2 parents f927e88 + f67422d
commit c0b9ee9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ build:
   stage: build
   script:
     - cd build
-    - cmake ..
+    - GPG_KEY_FINGERPRINT=0102030405060708090A0B0C0D0E0F1011121314 cmake ..
     - make install
 
   artifacts:
@@ -51,7 +51,7 @@ test:
     reports:
       cobertura: build/coverage.xml
     paths: 
-      - build/coverage.html
+      - build/coverage*.html
   cache:
     key: build-cache
     paths:

diff --git a/fuseecs/configuration.sh b/fuseecs/configuration.sh
@@ -37,8 +37,10 @@ sed -i '/#define ACCESS_USER_ID /c\#define ACCESS_USER_ID '`echo $UID` configura
 sed -i '/#define MOUNTPOINT_DIRECTORY \"\"/c\#define MOUNTPOINT_DIRECTORY \"'$MOUNTPOINT'\"' configuration.h
 sed -i '/#define ROOT_DIRECTORY \"\"/c\#define ROOT_DIRECTORY \"'$ENCRYPTED_DIRECTORY'\"' configuration.h
 sed -i '/#define DECRYPTED_DIRECTORY \"\"/c\#define DECRYPTED_DIRECTORY \"'$DECRYPTED_DIRECTORY'\"' configuration.h
-printf "Listing keys:\n"
-gpg2 --list-secret-keys
-read -p "Please copy and paste your key's fingerprint: " GPG_KEY_FINGERPRINT
+if [[ -z "${GPG_KEY_FINGERPRINT}" ]]; then
+  printf "Listing keys:\n"
+  gpg2 --list-secret-keys
+  read -p "Please copy and paste your key's fingerprint: " GPG_KEY_FINGERPRINT
+fi
 sed -i '/#define OWN_PUBLIC_KEY_FINGERPRINT \"\"/c\#define OWN_PUBLIC_KEY_FINGERPRINT \"'$GPG_KEY_FINGERPRINT'\"' configuration.h
-printf "Configuring configuration.h done.\n"
+printf "Configuring configuration.h done.\n"
diff --git a/fuseecs/test/gpg_operations_test.c b/fuseecs/test/gpg_operations_test.c
@@ -10,10 +10,12 @@ int __wrap_access(const char *pathname, int how) {
         return __real_access(pathname, how);
     }
 
+    check_expected(pathname);
     return mock_type(int);
 }
 
 static void test_directory_contains_authentic_file(void **state) {
+    expect_string(__wrap_access, pathname, "/foo/bar.txt0102030405060708090A0B0C0D0E0F1011121314.gpg");
     will_return(__wrap_access, 1);
 
     char *encrypted_directory = "/foo/";