[libvirt] [PATCH 0/3] tests: Clean up qemuxml2xml a bit

Andrea Bolognani posted 3 patches 5 years, 1 month ago
Only 2 patches received!
tests/qemuxml2xmltest.c                       |   6 +-
15 files changed, 11 insertions(+), 167 deletions(-)
copy tests/qemuxml2xmloutdata/{channel-unix-source-path.xml => channel-unix-source-path-active.xml} (86%)
rename tests/qemuxml2xmloutdata/{channel-unix-source-path.xml => channel-unix-source-path-inactive.xml} (100%)
copy tests/qemuxml2xmloutdata/{disk-active-commit.xml => disk-active-commit-active.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-active-commit.xml => disk-active-commit-inactive.xml} (86%)
delete mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml
rename tests/qemuxml2xmloutdata/{disk-backing-chains-noindex-active.xml => disk-backing-chains-noindex.xml} (100%)
rename tests/qemuxml2xmloutdata/{disk-mirror-old.xml => disk-mirror-old-active.xml} (100%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-baselabel.xml => seclabel-dynamic-baselabel-inactive.xml} (100%)
copy tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip.xml => seclabel-dynamic-labelskip-inactive.xml} (100%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none-relabel.xml => seclabel-dynamic-none-relabel-inactive.xml} (100%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-override.xml => seclabel-dynamic-override-inactive.xml} (100%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel-inactive.xml} (100%)
rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip.xml => seclabel-static-labelskip-active.xml} (100%)
rename tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip.xml => seclabel-static-labelskip-inactive.xml} (90%)
[libvirt] [PATCH 0/3] tests: Clean up qemuxml2xml a bit
Posted by Andrea Bolognani 5 years, 1 month ago
Just your average yak shaving, really.

Andrea Bolognani (3):
  tests: Rename some qemuxml2xml output files for clarity
  tests: Use WHEN_BOTH in qemuxml2xml whenever possible
  tests: Add -inactive suffix when appropriate for qemuxml2xml

 ...ml => channel-unix-source-path-active.xml} |   3 +
 ... => channel-unix-source-path-inactive.xml} |   0
 ...mmit.xml => disk-active-commit-active.xml} |   0
 ...it.xml => disk-active-commit-inactive.xml} |   8 +-
 .../disk-backing-chains-noindex-inactive.xml  | 156 ------------------
 ...ve.xml => disk-backing-chains-noindex.xml} |   0
 ...ror-old.xml => disk-mirror-old-active.xml} |   0
 ...> seclabel-dynamic-baselabel-inactive.xml} |   0
 ...> seclabel-dynamic-labelskip-inactive.xml} |   0
 ...eclabel-dynamic-none-relabel-inactive.xml} |   0
 ...=> seclabel-dynamic-override-inactive.xml} |   0
 ... => seclabel-dynamic-relabel-inactive.xml} |   0
 ...l => seclabel-static-labelskip-active.xml} |   0
 ...=> seclabel-static-labelskip-inactive.xml} |   5 +-
 tests/qemuxml2xmltest.c                       |   6 +-
 15 files changed, 11 insertions(+), 167 deletions(-)
 copy tests/qemuxml2xmloutdata/{channel-unix-source-path.xml => channel-unix-source-path-active.xml} (86%)
 rename tests/qemuxml2xmloutdata/{channel-unix-source-path.xml => channel-unix-source-path-inactive.xml} (100%)
 copy tests/qemuxml2xmloutdata/{disk-active-commit.xml => disk-active-commit-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{disk-active-commit.xml => disk-active-commit-inactive.xml} (86%)
 delete mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml
 rename tests/qemuxml2xmloutdata/{disk-backing-chains-noindex-active.xml => disk-backing-chains-noindex.xml} (100%)
 rename tests/qemuxml2xmloutdata/{disk-mirror-old.xml => disk-mirror-old-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-baselabel.xml => seclabel-dynamic-baselabel-inactive.xml} (100%)
 copy tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip.xml => seclabel-dynamic-labelskip-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none-relabel.xml => seclabel-dynamic-none-relabel-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-override.xml => seclabel-dynamic-override-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip.xml => seclabel-static-labelskip-active.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip.xml => seclabel-static-labelskip-inactive.xml} (90%)

-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
[libvirt] [PATCH 3/3] tests: Add -inactive suffix when appropriate for qemuxml2xml
Posted by Andrea Bolognani 5 years, 1 month ago
Some test cases are only executed using WHEN_INACTIVE, and the
output file name should reflect this for clarity.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
I'm actually not entirely convinced I prefer having the -inactive
suffix for these files, but I figured I'd still post the patch and
see what other people think :)

 ...amic-baselabel.xml => seclabel-dynamic-baselabel-inactive.xml} | 0
 ...amic-labelskip.xml => seclabel-dynamic-labelskip-inactive.xml} | 0
 ...one-relabel.xml => seclabel-dynamic-none-relabel-inactive.xml} | 0
 ...ynamic-override.xml => seclabel-dynamic-override-inactive.xml} | 0
 ...-dynamic-relabel.xml => seclabel-dynamic-relabel-inactive.xml} | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-baselabel.xml => seclabel-dynamic-baselabel-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip.xml => seclabel-dynamic-labelskip-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none-relabel.xml => seclabel-dynamic-none-relabel-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-override.xml => seclabel-dynamic-override-inactive.xml} (100%)
 rename tests/qemuxml2xmloutdata/{seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel-inactive.xml} (100%)

diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-override.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/seclabel-dynamic-relabel.xml
rename to tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
-- 
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 3/3] tests: Add -inactive suffix when appropriate for qemuxml2xml
Posted by Ján Tomko 5 years, 1 month ago
On Thu, Feb 28, 2019 at 05:38:47PM +0100, Andrea Bolognani wrote:
>Some test cases are only executed using WHEN_INACTIVE, and the
>output file name should reflect this for clarity.
>
>Signed-off-by: Andrea Bolognani <abologna@redhat.com>
>---
>I'm actually not entirely convinced I prefer having the -inactive
>suffix for these files, but I figured I'd still post the patch and
>see what other people think :)
>

I think that a certain combination of DO_TEST parameters should
unambiguously map to test filenames, i.e. no usage of virFileExists
when we fill out the filenames.

And making these asymetric tests stand out against the WHEN_BOTH tests
with identical outputs looks better to me.

But for identical outputs, I think we're better off reintroducing the
DO_TEST_DIFFERENT macro instead of encoding the info whether the outputs
are the same in the filesystem.

> ...amic-baselabel.xml => seclabel-dynamic-baselabel-inactive.xml} | 0
> ...amic-labelskip.xml => seclabel-dynamic-labelskip-inactive.xml} | 0
> ...one-relabel.xml => seclabel-dynamic-none-relabel-inactive.xml} | 0
> ...ynamic-override.xml => seclabel-dynamic-override-inactive.xml} | 0
> ...-dynamic-relabel.xml => seclabel-dynamic-relabel-inactive.xml} | 0
> 5 files changed, 0 insertions(+), 0 deletions(-)
> rename tests/qemuxml2xmloutdata/{seclabel-dynamic-baselabel.xml => seclabel-dynamic-baselabel-inactive.xml} (100%)
> rename tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip.xml => seclabel-dynamic-labelskip-inactive.xml} (100%)
> rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none-relabel.xml => seclabel-dynamic-none-relabel-inactive.xml} (100%)
> rename tests/qemuxml2xmloutdata/{seclabel-dynamic-override.xml => seclabel-dynamic-override-inactive.xml} (100%)
> rename tests/qemuxml2xmloutdata/{seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel-inactive.xml} (100%)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list