From 8bbf8e89008a03dd3a5e0738fcece430a5e8651e Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 2 May 2019 18:34:18 +0200
Subject: [PATCH] test-data: switch away from deprecated APIs

Adapt make-fedora-img.pl to not use deprecated APIs anymore:
- set_e2uuid -> set_uuid
- txz_in -> tar_in + compress:xz

This causes no changes in the generated test images.
---
 test-data/phony-guests/make-fedora-img.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test-data/phony-guests/make-fedora-img.pl b/test-data/phony-guests/make-fedora-img.pl
index 86a9ab43b..fbdf1bc6c 100755
--- a/test-data/phony-guests/make-fedora-img.pl
+++ b/test-data/phony-guests/make-fedora-img.pl
@@ -218,7 +218,7 @@ sub init_lvm_root {
     # Phony root filesystem.
     $g->mkfs ('ext2', '/dev/VG/Root', blocksize => 4096);
     $g->set_label ('/dev/VG/Root', 'ROOT');
-    $g->set_e2uuid ('/dev/VG/Root', '01234567-0123-0123-0123-012345678902');
+    $g->set_uuid ('/dev/VG/Root', '01234567-0123-0123-0123-012345678902');
 
     # Other filesystems.
     # Note that these should be empty, for testing virt-df.
@@ -232,7 +232,7 @@ sub init_lvm_root {
 # Phony /boot filesystem
 $g->mkfs ('ext2', $bootdev, blocksize => 4096);
 $g->set_label ($bootdev, 'BOOT');
-$g->set_e2uuid ($bootdev, '01234567-0123-0123-0123-012345678901');
+$g->set_uuid ($bootdev, '01234567-0123-0123-0123-012345678901');
 
 # Enough to fool inspection API.
 $g->mkdir ('/boot');
@@ -269,7 +269,7 @@ $g->upload ($ENV{SRCDIR}.'/fedora-packages.db', '/var/lib/rpm/Packages');
 
 $g->upload ($ENV{SRCDIR}.'/../binaries/bin-x86_64-dynamic', '/bin/ls');
 
-$g->txz_in ($ENV{SRCDIR}.'/fedora-journal.tar.xz', '/var/log/journal');
+$g->tar_in ($ENV{SRCDIR}.'/fedora-journal.tar.xz', '/var/log/journal', compress => "xz");
 
 $g->mkdir ('/boot/grub');
 $g->touch ('/boot/grub/grub.conf');