Move copy_from_guest to provision/base.py

[t184256]

... and change it a little.

[t184256]

force-push 36c3440: rebase on top of newer, non-broken master

[packit-as-a-service]

Congratulations! The build has finished successfully. 🍾

You can install the built RPMs by following these steps:

• sudo yum install -y dnf-plugins-core on RHEL 8
• sudo dnf install -y dnf-plugins-core on Fedora
• dnf copr enable packit/psss-tmt-75
• And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

[pvalena]

PTAL.

What other 'little' changes were introduced?

[t184256]

There really aren't many changes here:

1. moving copy_from_guest across classes unmodified
2. moving cmd_mkcp into along with it (changed as per your request)
3. inlining quote usage in cmd_mkcp:

-        target_dir = self.quote(target_dir)
-        target = self.quote(target)
-        return f'mkdir -p {target_dir}; cp -vafr {target} {target_dir}'
+        return f'mkdir -p "{target_dir}"; cp -vafr "{target}" "{target_dir}"'

I've expanded the commit message to mention 2 and 3.

[pvalena]

3. inlining `quote` usage in `cmd_mkcp`:

I don't see why, apart from losing one single-line method...
Maybe there actually is a need for quote() into our utils.py ... At some point, If we choose to switch to shlex.quote(), it will be much simpler. Even at this point, it would be simpler to change / override quote() if one needed nesting (the quote could be parametrized; or simply overriden with single-quote).

@psss WDYT?

[t184256]

I don't see why, apart from losing one single-line method...

This, and two lines spent invoking it.

[pvalena]

This, and two lines spent invoking it.

Well, that was only to make it more readable. I really try to avoid hardcoding stuff in favor of reusability. Also prior use of shlex was my motivation, and there's a chance we'll need something like that anyway (I've been told shlex.quote is in Python 3.7+, and we need to support 3.6 ATM).

[t184256]

Should I revert it and move the quote method as well?

[pvalena]

We've agreed \w @thrix to move quote into utils.py. Can you do it, or do you want me to do it?

---

Note: prepare has it's own variant with single quoting on purpose (so it could nest correctly with the vagrant one:

$ grep -r 'def quote' -A 2
tmt/steps/prepare/__init__.py:    def quote(self, string):
tmt/steps/prepare/__init__.py-        """ returns string decorated with squot """
tmt/steps/prepare/__init__.py-        return f"'{string}'"
--
tmt/steps/provision/vagrant.py:    def quote(self, string):
tmt/steps/provision/vagrant.py-        """ returns string decorated with dquot """
tmt/steps/provision/vagrant.py-        return f'"{string}"'

Please ignore it for now :)

[t184256]

Like this?

[t184256]

Rebased against current master.

[psss]

Looks good. Thanks for moving the method.

[thrix]

LGTM

[pvalena]

Like this?

Yes thank you both!

---

I didn't know you can actually include quote what's the behaviour there?