Fixed test

Velocidex · Aug 23, 2023 · e87515e · e87515e
1 parent 79b0f88
commit e87515e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/artifacts/definitions/Linux/Debian/AptSources.yaml b/artifacts/definitions/Linux/Debian/AptSources.yaml
@@ -466,7 +466,9 @@ sources:
 
          -- For each parsed apt .list file line produce some output.
          SELECT * from foreach(
-             row={SELECT * FROM parsed_apt_lines},
+             row={
+                 SELECT * FROM parsed_apt_lines
+             },
              query={
                 SELECT * FROM parse_cache_or_pass
               })
diff --git a/artifacts/testdata/server/testcases/debian.in.yaml b/artifacts/testdata/server/testcases/debian.in.yaml
@@ -13,13 +13,19 @@ Queries:
       aptCacheDirectory=srcDir + "/artifacts/testdata/files/debian/"
    )
 
- - SELECT "" AS Source, OSPath.Basename as OSPath, *
+ - SELECT OSPath.Basename as OSPath,
+      NULL AS Mtime,
+      NULL AS Ctime,
+      NULL AS Atime,
+      NULL AS Source, *
+
    FROM Artifact.Linux.Debian.AptSources(
       source="SourcesCacheFiles",
       linuxAptSourcesGlobs=[dict(ListGlobs=srcDir + "/artifacts/testdata/files/debian/sources.list")],
       aptCacheDirectory=srcDir + "/artifacts/testdata/files/debian/"
    )
-   WHERE OSPath
+   WHERE Record
+
 
  - SELECT *
    FROM Artifact.Linux.Debian.Packages(

diff --git a/artifacts/testdata/server/testcases/debian.out.yaml b/artifacts/testdata/server/testcases/debian.out.yaml
@@ -460,13 +460,14 @@ SELECT OSPath.Basename AS OSPath, * FROM Artifact.Linux.Debian.AptSources( sourc
   "Types": "deb",
   "_Source": "Linux.Debian.AptSources/SourcesFlattened"
  }
-]SELECT "" AS Source, OSPath.Basename as OSPath, * FROM Artifact.Linux.Debian.AptSources( source="SourcesCacheFiles", linuxAptSourcesGlobs=[dict(ListGlobs=srcDir + "/artifacts/testdata/files/debian/sources.list")], aptCacheDirectory=srcDir + "/artifacts/testdata/files/debian/" ) WHERE OSPath[
+]SELECT OSPath.Basename as OSPath, NULL AS Mtime, NULL AS Ctime, NULL AS Atime, NULL AS Source, *
+FROM Artifact.Linux.Debian.AptSources( source="SourcesCacheFiles", linuxAptSourcesGlobs=[dict(ListGlobs=srcDir + "/artifacts/testdata/files/debian/sources.list")], aptCacheDirectory=srcDir + "/artifacts/testdata/files/debian/" ) WHERE Record[
  {
-  "Source": "",
   "OSPath": "au.archive.ubuntu.com_ubuntu_dists_jammy_InRelease",
-  "Mtime": "2023-08-23T10:45:25Z",
-  "Ctime": "2023-08-23T10:45:25Z",
-  "Atime": "2023-08-23T10:55:22Z",
+  "Mtime": null,
+  "Ctime": null,
+  "Atime": null,
+  "Source": null,
   "Record": {
    "Release": "jammy",
    "Version": "22.04",