Keep the Plugin Tests' Python Packages Out of the Working Directory

The plugin test fixtures start the interpreter before the test points
data_dir at its temporary directory, so PythonInterpreter creates
{data_dir}/python/packages and {data_dir}/log with an empty data_dir: a
python/ and log/ folder in whatever directory the tests run from. When that
is the test binary's folder, the next run's embedded-interpreter tests took
the stray python/ as their home and failed to start Python.

Give each fixture that initializes the plugin manager its own temporary
data directory, set up before initialize(), and only use the python/ folder
next to the test binary as the interpreter's home when it holds a standard
library.

src/slic3r/CMakeLists.txt

@@ -1019,9 +1019,14 @@ if (UNIX AND NOT APPLE)
     find_package(GTK${SLIC3R_GTK} REQUIRED)
     pkg_check_modules(LIBSECRET REQUIRED libsecret-1)
     pkg_check_modules(webkit2gtk REQUIRED webkit2gtk-4.1)
-    find_package(X11 REQUIRED)
+    if (FLATPAK)
+        # I don't know why this is needed, but for whatever reason slic3r isn't
+        # linking to X11 and webkit2gtk. force it.
+        find_package(X11 REQUIRED)
+        target_link_libraries(libslic3r_gui ${X11_LIBRARIES} ${webkit2gtk_LIBRARIES})
+    endif()
     target_include_directories(libslic3r_gui SYSTEM PRIVATE ${GTK${SLIC3R_GTK}_INCLUDE_DIRS} ${LIBSECRET_INCLUDE_DIRS} ${webkit2gtk_INCLUDE_DIRS})
-    target_link_libraries(libslic3r_gui ${GTK${SLIC3R_GTK}_LIBRARIES} fontconfig ${LIBSECRET_LIBRARIES} ${webkit2gtk_LIBRARIES} ${X11_LIBRARIES})
+    target_link_libraries(libslic3r_gui ${GTK${SLIC3R_GTK}_LIBRARIES} fontconfig ${LIBSECRET_LIBRARIES})
 
     # Propagate GDK backend detection results as compile definitions so that
     # LinuxDisplayBackend.cpp can include the right GDK headers.

src/slic3r/GUI/GUI.cpp

@@ -14,9 +14,6 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/any.hpp>
 
-#include <wx/filename.h>
-#include <wx/filesys.h>
-
 #if __APPLE__
 #import <IOKit/pwr_mgt/IOPMLib.h>
 #elif _WIN32
@@ -534,11 +531,6 @@ boost::filesystem::path into_path(const wxString &str)
 	return boost::filesystem::path(str.wx_str());
 }
 
-wxString file_url_from_path(const boost::filesystem::path &path)
-{
-	return wxFileSystem::FileNameToURL(wxFileName(from_path(path)));
-}
-
 void about()
 {
     AboutDialog dlg;

src/slic3r/GUI/GUI.hpp

@@ -76,9 +76,6 @@ std::string	into_u8(const wxString &str);
 wxString	from_path(const boost::filesystem::path &path);
 // boost path from wxString
 boost::filesystem::path	into_path(const wxString &str);
-// file:// URL of a local path, percent-encoded so characters such as '#', '%' and '?' stay part of the path.
-// Append any query or fragment to the result.
-wxString	file_url_from_path(const boost::filesystem::path &path);
 
 // Display an About dialog
 extern void about();

src/slic3r/GUI/MarkdownTip.cpp

@@ -98,7 +98,10 @@ void MarkdownTip::LoadStyle()
         ph /= "tooltip/styled.html";
         _data_dir = false;
     }
-    _tipView->LoadURL(file_url_from_path(ph));
+    auto url = ph.string();
+    std::replace(url.begin(), url.end(), '\\', '/');
+    url = "file:///" + url;
+    _tipView->LoadURL(from_u8(url));
     _lastTip.clear();
 }
 

src/slic3r/GUI/Plater.cpp

@@ -3672,7 +3672,7 @@ void Sidebar::update_all_preset_comboboxes()
         wxString url = from_u8(PrintHost::get_print_host_webui(&cfg));
         wxString apikey;
         if(url.empty())
-            url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/orca/missing_connection.html");
+            url = wxString::Format("file://%s/web/orca/missing_connection.html", from_u8(resources_dir()));
         else {
             const auto host_type = cfg.option<ConfigOptionEnum<PrintHostType>>("host_type")->value;
             if (cfg.has("printhost_apikey") && (host_type != htSimplyPrint))

src/slic3r/GUI/PrivacyUpdateDialog.cpp

@@ -57,7 +57,9 @@ PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const
 
     fs::path ph(resources_dir());
     ph /= "tooltip/privacyupdate.html";
-    m_host_url = into_u8(file_url_from_path(ph));
+    m_host_url = ph.string();
+    std::replace(m_host_url.begin(), m_host_url.end(), '\\', '/');
+    m_host_url = "file:///" + m_host_url;
     m_vebview_release_note->LoadURL(from_u8(m_host_url));
     m_sizer_right->Add(m_vebview_release_note, 0, wxEXPAND | wxRIGHT | wxLEFT, FromDIP(15));
 

src/slic3r/GUI/Project.cpp

@@ -45,10 +45,10 @@ const std::vector<std::string> license_list = {
 ProjectPanel::ProjectPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style) : wxPanel(parent, id, pos, size, style)
 {
     SetBackgroundColour(*wxWHITE);
-    m_project_home_url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/model/index.html");
+    m_project_home_url = wxString::Format("file://%s/web/model/index.html", from_u8(resources_dir()));
     wxString strlang = wxGetApp().current_language_code_safe();
     if (strlang != "")
-        m_project_home_url += "?lang=" + strlang;
+        m_project_home_url = wxString::Format("file://%s/web/model/index.html?lang=%s", from_u8(resources_dir()), strlang);
 
     wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
 

src/slic3r/GUI/ReleaseNote.cpp

@@ -510,7 +510,7 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve
         out_buf->append(text, size);
     }, (void*) &html_source, MD_DIALECT_GITHUB | MD_FLAG_STRIKETHROUGH | MD_FLAG_WIKILINKS, 0);
     html_source.append("</body></html>");
-    m_vebview_release_note->LoadURL(file_url_from_path(boost::filesystem::path(resources_dir()) / "web/guide/0/index.html"));
+    m_vebview_release_note->LoadURL("file://" + (boost::filesystem::path (resources_dir()) / "web/guide/0/index.html").string());
 
     SetMinSize(GetSize());
     SetMaxSize(GetSize());

src/slic3r/GUI/UserManager.cpp

@@ -31,15 +31,14 @@ int UserManager::parse_json(std::string payload)
 {
     bool restored_json = false;
     json j;
+    json j_pre = json::parse(payload);
+    if (j_pre.empty()) {
+        return -1;
+    }
 
     //bind/unbind
 
     try {
-        json j_pre = json::parse(payload);
-        if (j_pre.empty()) {
-            return -1;
-        }
-
         if (j_pre.contains("bind")) {
             if (j_pre["bind"].contains("command")) {
 

src/slic3r/GUI/WebDownPluginDlg.cpp

@@ -38,7 +38,9 @@ DownPluginFrame::DownPluginFrame(GUI_App *pGUI) : wxDialog((wxWindow *) (pGUI->m
 
     // set the frame icon
     wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
-    wxString TargetUrl    = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/guide/6/index.html");
+    wxString TargetUrl    = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/6/index.html").make_preferred().string());
+
+    TargetUrl = "file://" + TargetUrl;
 
     // Create the webview
     m_browser = WebView::CreateWebView(this, TargetUrl);

src/slic3r/GUI/WebGuideDialog.cpp

@@ -218,38 +218,37 @@ wxString GuideFrame::SetStartPage(GuidePage startpage, bool load)
     m_page = startpage;
     BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(" enter, load=%1%, start_page=%2%")%load%int(startpage);
     //wxLogMessage("GUIDE: webpage_1  %s", (boost::filesystem::path(resources_dir()) / "web\\guide\\1\\index.html").make_preferred().string().c_str() );
-    const wxString guide_url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/guide/0/index.html");
-    wxString TargetUrl = guide_url + "?target=1";
+    wxString TargetUrl = from_u8( (boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=1").make_preferred().string() );
     //wxLogMessage("GUIDE: webpage_2  %s", TargetUrl.mb_str());
 
     if (startpage == BBL_WELCOME){
         SetTitle(_L("Setup Wizard"));
-        TargetUrl = guide_url + "?target=1";
+        TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=1").make_preferred().string());
     } else if (startpage == BBL_REGION) {
         SetTitle(_L("Setup Wizard"));
-        TargetUrl = guide_url + "?target=11";
+        TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=11").make_preferred().string());
     } else if (startpage == BBL_MODELS) {
         SetTitle(_L("Setup Wizard"));
-        TargetUrl = guide_url + "?target=21";
+        TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=21").make_preferred().string());
     } else if (startpage == BBL_FILAMENTS) {
         SetTitle(_L("Setup Wizard"));
 
         int nSize = m_ProfileJson["model"].size();
 
         if (nSize>0)
-            TargetUrl = guide_url + "?target=22";
+            TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=22").make_preferred().string());
         else
-            TargetUrl = guide_url + "?target=21";
+            TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=21").make_preferred().string());
     } else if (startpage == BBL_FILAMENT_ONLY) {
         SetTitle("");
-        TargetUrl = guide_url + "?target=23";
+        TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=23").make_preferred().string());
     } else if (startpage == BBL_MODELS_ONLY) {
         SetTitle("");
-        TargetUrl = guide_url + "?target=24";
+        TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=24").make_preferred().string());
     }
     else {
         SetTitle(_L("Setup Wizard"));
-        TargetUrl = guide_url + "?target=21";
+        TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=21").make_preferred().string());
     }
 
     wxString strlang = wxGetApp().current_language_code_safe();
@@ -257,6 +256,7 @@ wxString GuideFrame::SetStartPage(GuidePage startpage, bool load)
     if (strlang != "")
         TargetUrl = wxString::Format("%s&lang=%s", w2s(TargetUrl), strlang);
 
+    TargetUrl = "file://" + TargetUrl;
     if (load)
         load_url(TargetUrl);
 
@@ -1284,7 +1284,7 @@ bool GuideFrame::BuildProfileJson(const PresetBundle& bundle, bool require_all_r
                 entry["vendor"]          = vp.id;
                 entry["nozzle_diameter"] = nozzle_str;
                 entry["materials"]       = materials_str;
-                entry["cover"]           = into_u8(file_url_from_path(cover_path));
+                entry["cover"]           = cover_path.string();
                 entry["nozzle_selected"] = "";
                 entry["sub_path"]        = "";
                 m_ProfileJson["model"].push_back(entry);
@@ -1732,7 +1732,7 @@ int GuideFrame::LoadProfileFamily(std::string strVendor, std::string strFilePath
                     cover_path = (boost::filesystem::absolute(boost::filesystem::path(resources_dir()) / "/web/image/printer/") / cover_file)
                                      .make_preferred();
             }
-            OneModel["cover"]                  = into_u8(file_url_from_path(cover_path));
+            OneModel["cover"]                  = cover_path.string();
 
             OneModel["nozzle_selected"] = "";
 

src/slic3r/GUI/WebUserLoginDialog.cpp

@@ -599,7 +599,7 @@ void ZUserLogin::OnScriptResponseMessage(wxCommandEvent &WXUNUSED(evt))
 
 bool  ZUserLogin::ShowErrorPage()
 {
-    wxString ErrortUrl = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/login/error.html");
+    wxString ErrortUrl = from_u8((boost::filesystem::path(resources_dir()) / "web\\login\\error.html").make_preferred().string());
     load_url(ErrortUrl);
 
     return true;

src/slic3r/GUI/WebViewDialog.cpp

@@ -36,10 +36,10 @@ namespace GUI {
 WebViewPanel::WebViewPanel(wxWindow *parent)
         : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
  {
-    wxString url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/homepage/index.html");
+    wxString url = wxString::Format("file://%s/web/homepage/index.html", from_u8(resources_dir()));
     wxString strlang = wxGetApp().current_language_code_safe();
     if (strlang != "")
-        url += "?lang=" + strlang;
+        url = wxString::Format("file://%s/web/homepage/index.html?lang=%s", from_u8(resources_dir()), strlang);
 
     wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL);
     

src/slic3r/GUI/Widgets/MultiNozzleSync.cpp

@@ -1,6 +1,5 @@
 #include "MultiNozzleSync.hpp"
 
-#include "../GUI.hpp"
 #include "../GUI_App.hpp"
 #include "../I18N.hpp"
 #include "../Plater.hpp"
@@ -22,6 +21,8 @@
 #include <set>
 
 #include <wx/choice.h>
+#include <wx/filename.h>
+#include <wx/filesys.h>
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 
@@ -640,7 +641,8 @@ NozzleListTable::NozzleListTable(wxWindow* parent) : wxPanel(parent,wxID_ANY,wxD
     m_web_view->AddScriptMessageHandler("nozzleListTable");
     m_web_view->EnableContextMenu(false);
     fs::path filepath = fs::path(resources_dir()) / "web/flush/NozzleListTable.html";
-    wxString url = file_url_from_path(filepath);
+    wxFileName fn(wxString::FromUTF8(filepath.string()));
+    wxString url = wxFileSystem::FileNameToURL(fn);
     m_web_view->LoadURL(url);
 
     auto sizer = new wxBoxSizer(wxVERTICAL);

src/slic3r/GUI/Widgets/WebHosting.cpp

@@ -48,19 +48,20 @@ constexpr char ORCA_BRIDGE_JS[] = R"JS(
 
 wxString bootstrap_url()
 {
-    return file_url_from_path(boost::filesystem::path(resources_dir()) / BOOTSTRAP_PAGE);
+    return wxString("file://") + from_u8((boost::filesystem::path(resources_dir()) / BOOTSTRAP_PAGE).make_preferred().string());
 }
 
 wxString content_base_url()
 {
-    return file_url_from_path(boost::filesystem::path(resources_dir()) / "web") + "/";
+    const std::string dir = (boost::filesystem::path(resources_dir()) / "web").make_preferred().string();
+    return wxString("file://") + from_u8(dir) + "/";
 }
 
 bool is_content_url(const wxString& url)
 {
-    // The web view reports the URL it parsed, which may escape the resources path differently
-    // from content_base_url().
-    return wxURI::Unescape(url.BeforeFirst('#')) == wxURI::Unescape(content_base_url());
+    // The web view reports the URL it parsed, which escapes anything the resources path holds
+    // (a space, a non-ASCII character), while content_base_url() is the raw path.
+    return wxURI::Unescape(url.BeforeFirst('#')) == content_base_url();
 }
 
 const char* orca_bridge_script() { return ORCA_BRIDGE_JS; }

src/slic3r/GUI/Widgets/WebViewHostDialog.cpp

@@ -192,7 +192,7 @@ bool WebViewHostDialog::create_webview(const std::string& resource_path,
 
 wxString WebViewHostDialog::build_resource_url(const std::string& resource_path) const
 {
-    wxString target_url = file_url_from_path(boost::filesystem::path(resources_dir()) / resource_path);
+    wxString target_url = from_u8((boost::filesystem::path(resources_dir()) / resource_path).make_preferred().string());
 
     if (append_language_to_url()) {
         const wxString lang = wxGetApp().current_language_code_safe();
@@ -202,7 +202,7 @@ wxString WebViewHostDialog::build_resource_url(const std::string& resource_path)
         }
     }
 
-    return target_url;
+    return wxString("file://") + target_url;
 }
 
 void WebViewHostDialog::load_url(const wxString& url)

src/slic3r/GUI/WipeTowerDialog.cpp

@@ -464,7 +464,7 @@ WipingDialog::WipingDialog(wxWindow* parent, const int max_flush_volume) :
     wxString filepath_str = from_path(filepath);
     wxFileName fn(filepath_str);
     if(fn.FileExists()) {
-        wxString url = file_url_from_path(filepath);
+        wxString url = wxFileSystem::FileNameToURL(fn);
         BOOST_LOG_TRIVIAL(debug) << __FUNCTION__<< "File exists and load url " << url.ToStdString();
         m_webview->LoadURL(url);
         BOOST_LOG_TRIVIAL(debug) << __FUNCTION__<< "Successfully loaded url: " << url.ToStdString();

src/slic3r/Utils/Duet.cpp

@@ -274,4 +274,13 @@ bool Duet::start_print(wxString &msg, const std::string &filename, ConnectionTyp
 	return res;
 }
 
+int Duet::get_err_code_from_body(const std::string &body) const
+{
+	pt::ptree root;
+	std::istringstream iss (body); // wrap returned json to istringstream
+	pt::read_json(iss, root);
+
+	return root.get<int>("err", 0);
+}
+
 }

src/slic3r/Utils/Duet.hpp

@@ -40,6 +40,7 @@ private:
 	ConnectionType connect(wxString &msg) const;
 	void disconnect(ConnectionType connectionType) const;
 	bool start_print(wxString &msg, const std::string &filename, ConnectionType connectionType, bool simulationMode) const;
+	int get_err_code_from_body(const std::string &body) const;
 };
 
 }

src/slic3r/Utils/ESP3D.cpp

@@ -146,6 +146,15 @@ bool ESP3D::start_print(wxString& msg, const std::string& filename) const
     return ret;
 }
 
+int ESP3D::get_err_code_from_body(const std::string& body) const
+{
+    pt::ptree          root;
+    std::istringstream iss(body); // wrap returned json to istringstream
+    pt::read_json(iss, root);
+
+    return root.get<int>("err", 0);
+}
+
 // ESP3D only accepts 8.3 filenames else it crashes marlin and other undefined behaviour
 std::string ESP3D::get_short_name(const std::string& filename) const
 {

src/slic3r/Utils/ESP3D.hpp

@@ -33,6 +33,7 @@ private:
     std::string m_console_port;
 
     bool        start_print(wxString& msg, const std::string& filename) const;
+    int         get_err_code_from_body(const std::string& body) const;
     std::string get_short_name(const std::string& filename) const;
     std::string format_command(const std::string& path, const std::string& arg, const std::string& val) const;
 };

src/slic3r/Utils/ElegooLink.cpp

@@ -340,7 +340,9 @@ namespace Slic3r {
         if (classify_printer_model(config->opt_string("printer_model")) != ElegooPrinterType::CC2)
             return fallback_webui;
 
-        std::string web_path = GUI::into_u8(GUI::file_url_from_path(boost::filesystem::path(resources_dir()) / "web/elegoolink/lan_service_web/index.html"));
+        std::string web_path = resources_dir() + "/web/elegoolink/lan_service_web/index.html";
+        std::replace(web_path.begin(), web_path.end(), '\\', '/');
+        web_path = "file://" + web_path;
         const std::string token   = get_cc2_token(config->opt_string("printhost_apikey"));
         const std::string host_ip = Http::get_host_header_value(host);
 

src/slic3r/Utils/Flashforge.cpp

@@ -510,22 +510,12 @@ bool Flashforge::fetch_material_slots(std::vector<FlashforgeMaterialSlot>& slots
     if (!request_local_api_json("detail", json{{"serialNumber", m_serial_number}, {"checkCode", m_check_code}}.dump(), body, msg))
         return false;
 
-    if (!parse_material_slots(body, slots, supports_material_station)) {
+    const auto parsed = json::parse(body, nullptr, false, true);
+    if (parsed.is_discarded()) {
         msg = _(L("Flashforge returned an invalid JSON response."));
         return false;
     }
 
-    return true;
-}
-
-bool Flashforge::parse_material_slots(const std::string& body, std::vector<FlashforgeMaterialSlot>& slots, bool* supports_material_station)
-{
-    slots.clear();
-
-    const auto parsed = json::parse(body, nullptr, false, true);
-    if (parsed.is_discarded())
-        return false;
-
     const auto& detail = parsed.contains("detail") ? parsed["detail"] : parsed;
     const auto& station = detail.contains("matlStationInfo") ? detail["matlStationInfo"] :
                           detail.contains("MatlStationInfo") ? detail["MatlStationInfo"] : json();
@@ -552,21 +542,12 @@ bool Flashforge::parse_material_slots(const std::string& body, std::vector<Flash
     if (supports_material_station != nullptr)
         *supports_material_station = reports_material_station;
 
-    // Fields are read leniently: firmware may send numbers as strings or flags as numbers.
     for (const auto& slot : slot_infos) {
-        if (!slot.is_object())
-            continue;
         FlashforgeMaterialSlot info;
-        info.slot_id = static_cast<int>(slots.size()) + 1;
-        if (const auto it = slot.find("slotId"); it != slot.end())
-            try_parse_json_int(*it, info.slot_id);
-        int has_filament = 0;
-        if (const auto it = slot.find("hasFilament"); it != slot.end() && try_parse_json_int(*it, has_filament))
-            info.has_filament = has_filament != 0;
-        if (const auto it = slot.find("materialName"); it != slot.end() && it->is_string())
-            info.material_name = it->get<std::string>();
-        if (const auto it = slot.find("materialColor"); it != slot.end() && it->is_string())
-            info.material_color = it->get<std::string>();
+        info.slot_id        = slot.value("slotId", static_cast<int>(slots.size()) + 1);
+        info.has_filament   = slot.value("hasFilament", false);
+        info.material_name  = slot.value("materialName", std::string());
+        info.material_color = slot.value("materialColor", std::string());
         slots.emplace_back(std::move(info));
     }
 
@@ -689,4 +670,13 @@ std::string Flashforge::extract_host_name() const
     return out;
 }
 
+int Flashforge::get_err_code_from_body(const std::string& body) const
+{
+    pt::ptree          root;
+    std::istringstream iss(body); // wrap returned json to istringstream
+    pt::read_json(iss, root);
+
+    return root.get<int>("err", 0);
+}
+
 } // namespace Slic3r

src/slic3r/Utils/Flashforge.hpp

@@ -45,8 +45,6 @@ public:
     PrintHostPostUploadActions get_post_upload_actions() const override { return PrintHostPostUploadAction::StartPrint; }
     std::string                get_host() const override { return m_host; }
     bool                       fetch_material_slots(std::vector<FlashforgeMaterialSlot>& slots, bool* supports_material_station, wxString& msg) const;
-    // Parses a local API "detail" reply. Returns false when the body is not valid JSON.
-    static bool                parse_material_slots(const std::string& body, std::vector<FlashforgeMaterialSlot>& slots, bool* supports_material_station);
     static bool                discover_printers(std::vector<FlashforgeDiscoveredPrinter>& printers, wxString& msg, int timeout_ms = 10000, int idle_timeout_ms = 1500, int max_retries = 3);
 
 private:
@@ -70,6 +68,7 @@ private:
     bool request_local_api_json(const std::string& path, const std::string& body, std::string& response_body, wxString& error_msg) const;
     std::string make_http_url(const std::string& path) const;
     std::string extract_host_name() const;
+    int  get_err_code_from_body(const std::string &body) const;
     bool connect(wxString& msg) const;
     bool start_print(wxString& msg, const std::string& filename) const;
 };

src/slic3r/Utils/MKS.cpp

@@ -141,4 +141,13 @@ bool MKS::start_print(wxString& msg, const std::string& filename) const
 	return ret;
 }
 
+int MKS::get_err_code_from_body(const std::string& body) const
+{
+	pt::ptree root;
+	std::istringstream iss(body); // wrap returned json to istringstream
+	pt::read_json(iss, root);
+
+	return root.get<int>("err", 0);
+}
+
 } // Slic3r

src/slic3r/Utils/MKS.hpp

@@ -34,6 +34,7 @@ private:
 
 	std::string get_upload_url(const std::string& filename) const;
 	bool start_print(wxString& msg, const std::string& filename) const;
+	int get_err_code_from_body(const std::string& body) const;
 };
 
 }

src/slic3r/Utils/PrintHost.cpp

@@ -3,13 +3,10 @@
 #include <vector>
 #include <thread>
 #include <exception>
-#include <sstream>
 #include <boost/optional.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/filesystem.hpp>
 #include <nlohmann/json.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
 
 #include <wx/string.h>
 #include <wx/app.h>
@@ -175,20 +172,6 @@ std::string moonraker_error_reason(const std::string &body)
 
 } // namespace
 
-int PrintHost::get_err_code_from_body(const std::string &body)
-{
-    boost::property_tree::ptree root;
-    std::istringstream iss(body);
-    try {
-        boost::property_tree::read_json(iss, root);
-    } catch (const std::exception &ex) {
-        BOOST_LOG_TRIVIAL(error) << "PrintHost: response is not valid JSON: " << ex.what();
-        return -1;
-    }
-
-    return root.get<int>("err", 0);
-}
-
 wxString PrintHost::format_error(const std::string &body, const std::string &error, unsigned status) const
 {
     if (status != 0) {
@@ -432,10 +415,12 @@ void PrintHostJobQueue::priv::remove_source()
     source_to_remove.clear();
 }
 
-bool PrintHostJobQueue::upload_job(PrintHostJob &job, PrintHost::ProgressFn progress_fn, PrintHost::ErrorFn error_fn, PrintHost::InfoFn info_fn)
+void PrintHostJobQueue::priv::perform_job(PrintHostJob the_job)
 {
+    emit_progress(0);   // Indicate the upload is starting
+
     // Captured before upload_data is moved into upload() below.
-    const std::string upload_filename = job.upload_data.source_path.filename().string();
+    const std::string upload_filename = the_job.upload_data.source_path.filename().string();
 
     {
         LifecycleEventContext ctx;
@@ -444,37 +429,19 @@ bool PrintHostJobQueue::upload_job(PrintHostJob &job, PrintHost::ProgressFn prog
         fire_lifecycle_event(LifecycleEvent::UploadStarted, ctx);
     }
 
-    bool success = false;
-    std::string error;
-    // A throwing upload must not stop the worker, or later jobs would stay queued forever.
-    try {
-        success = job.printhost->upload(std::move(job.upload_data), std::move(progress_fn), error_fn, std::move(info_fn));
-    } catch (const std::exception &e) {
-        error = e.what();
-        error_fn(error);
-    }
+    bool success = the_job.printhost->upload(std::move(the_job.upload_data),
+        [this](Http::Progress progress, bool &cancel)   { this->progress_fn(std::move(progress), cancel); },
+        [this](wxString error)                          { this->error_fn(std::move(error)); },
+        [this](wxString tag, wxString host)             { this->info_fn(std::move(tag), std::move(host)); }
+    );
 
     {
         LifecycleEventContext ctx;
         ctx.name  = upload_filename;
         ctx.code  = success ? LifecycleEvtCode::Ok : LifecycleEvtCode::Error;
-        ctx.msg   = error;
         fire_lifecycle_event(LifecycleEvent::UploadFinished, ctx);
     }
 
-    return success;
-}
-
-void PrintHostJobQueue::priv::perform_job(PrintHostJob the_job)
-{
-    emit_progress(0);   // Indicate the upload is starting
-
-    bool success = PrintHostJobQueue::upload_job(the_job,
-        [this](Http::Progress progress, bool &cancel)   { this->progress_fn(std::move(progress), cancel); },
-        [this](wxString error)                          { this->error_fn(std::move(error)); },
-        [this](wxString tag, wxString host)             { this->info_fn(std::move(tag), std::move(host)); }
-    );
-
     if (success) {
         emit_progress(100);
         if (the_job.switch_to_device_tab) {

src/slic3r/Utils/PrintHost.hpp

@@ -87,8 +87,6 @@ public:
 
     static PrintHost* get_print_host(DynamicPrintConfig *config);
     static std::string get_print_host_webui(DynamicPrintConfig *config);
-    // Reads the "err" field of a JSON reply, 0 when absent. Returns -1 when the body is not valid JSON.
-    static int get_err_code_from_body(const std::string &body);
 
     //Support for cloud webui login
     virtual bool is_cloud() const { return false; }
@@ -152,10 +150,6 @@ public:
     void enqueue(PrintHostJob job);
     void cancel(size_t id);
 
-    // Uploads the job, firing UploadStarted and a matching UploadFinished. An exception thrown by
-    // the upload is reported through error_fn and makes the upload fail.
-    static bool upload_job(PrintHostJob &job, PrintHost::ProgressFn progress_fn, PrintHost::ErrorFn error_fn, PrintHost::InfoFn info_fn);
-
 private:
     struct priv;
     std::shared_ptr<priv> p;

src/slic3r/Utils/UltiMaker.cpp

@@ -654,4 +654,13 @@ bool UltiMaker::start_print(wxString &msg, const std::string &filename, Connecti
 	return res;
 }
 
+int UltiMaker::get_err_code_from_body(const std::string &body) const
+{
+	pt::ptree root;
+	std::istringstream iss (body); // wrap returned json to istringstream
+	pt::read_json(iss, root);
+
+	return root.get<int>("err", 0);
+}
+
 }

src/slic3r/Utils/UltiMaker.hpp

@@ -64,6 +64,7 @@ private:
 	void set_auth(Http& http) const;
 	void disconnect(ConnectionType connectionType) const;
 	bool start_print(wxString &msg, const std::string &filename, ConnectionType connectionType) const;
+	int get_err_code_from_body(const std::string &body) const;
 };
 
 }

tests/slic3rutils/CMakeLists.txt

@@ -27,8 +27,6 @@ add_executable(${_TEST_NAME}_tests
     test_plugin_cloud_metadata.cpp
     test_plugin_audit.cpp
     test_shortcuts.cpp
-    test_file_url.cpp
-    test_user_manager.cpp
     ../fff_print/test_helpers.cpp
     )
 

tests/slic3rutils/python_test_support.hpp

@@ -6,6 +6,7 @@
 #include <boost/filesystem.hpp>
 #include <memory.h>
 #include <stdexcept>
+#include <string>
 #include <pybind11/embed.h>
 #include <pybind11/pybind11.h>
 
@@ -25,8 +26,15 @@ void ensure_python_initialized()
     config.parse_argv = 0;
 
     const auto python_home = boost::dll::program_location().parent_path() / "python";
+#ifdef _WIN32
+    const auto stdlib = python_home / "Lib";
+#else
+    const auto stdlib = python_home / "lib" /
+                        ("python" + std::to_string(PY_MAJOR_VERSION) + "." + std::to_string(PY_MINOR_VERSION));
+#endif
 
-    if (boost::filesystem::exists(python_home)) {
+    // Only a real runtime: a stray python/ folder (packages a test left behind) is not a home.
+    if (boost::filesystem::exists(stdlib / "encodings")) {
         const std::string home = python_home.string();
         const PyStatus status  = PyConfig_SetBytesString(&config, &config.home, home.c_str());
 

tests/slic3rutils/test_file_url.cpp

@@ -1,74 +0,0 @@
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/generators/catch_generators.hpp>
-
-#include "slic3r/GUI/GUI.hpp"
-
-#include <boost/filesystem/path.hpp>
-
-#include <wx/uri.h>
-
-using namespace Slic3r::GUI;
-
-#ifndef _WIN32
-TEST_CASE("A file URL keeps characters special to URLs in its path", "[FileUrl]")
-{
-    const std::string path = GENERATE(as<std::string>{},
-        "/opt/test#dir/resources/web/homepage/index.html",
-        "/opt/test%20x/resources/web/homepage/index.html",
-        "/opt/Orca Slicer/resources/web/homepage/index.html",
-        "/opt/what?/resources/web/homepage/index.html",
-        "/home/Jos\xC3\xA9/\xE8\xB5\x84\xE6\xBA\x90/resources/web/homepage/index.html");
-
-    const wxString url = file_url_from_path(boost::filesystem::path(path));
-    CAPTURE(path, url.utf8_string());
-
-    // WebView::CreateWebView() and WebView::LoadUrl() re-parse the URL before loading it.
-    const wxURI uri(wxURI(url).BuildURI());
-    CHECK(uri.GetScheme() == "file");
-    CHECK(!uri.HasQuery());
-    CHECK(!uri.HasFragment());
-    CHECK(wxURI::Unescape(uri.GetPath()).utf8_string() == path);
-}
-
-TEST_CASE("A file URL of a plain path is the path behind file://", "[FileUrl]")
-{
-    const std::string path = "/opt/OrcaSlicer/resources/web/homepage/index.html";
-    CHECK(file_url_from_path(boost::filesystem::path(path)) == "file://" + path);
-}
-
-TEST_CASE("A query appended to a file URL stays separate from its path", "[FileUrl]")
-{
-    const std::string path = "/opt/test#dir%20x/resources/web/guide/0/index.html";
-    const wxURI uri(file_url_from_path(boost::filesystem::path(path)) + "?target=21&lang=de");
-    CHECK(wxURI::Unescape(uri.GetPath()).utf8_string() == path);
-    CHECK(uri.GetQuery() == "target=21&lang=de");
-    CHECK(!uri.HasFragment());
-}
-#else
-TEST_CASE("A file URL of a Windows path has a drive letter and forward slashes", "[FileUrl]")
-{
-    const auto [path, url] = GENERATE(table<std::wstring, std::string>({
-        { L"C:\\Program Files\\OrcaSlicer\\resources\\web\\homepage\\index.html",
-          "file:///C:/Program%20Files/OrcaSlicer/resources/web/homepage/index.html" },
-        { L"D:\\#OneDrive\\OrcaSlicer\\resources\\web\\guide\\0\\index.html",
-          "file:///D:/%23OneDrive/OrcaSlicer/resources/web/guide/0/index.html" },
-        { L"D:\\100%\\OrcaSlicer\\resources\\web\\homepage\\index.html",
-          "file:///D:/100%25/OrcaSlicer/resources/web/homepage/index.html" },
-        // Callers join the resources directory with a forward-slash relative path.
-        { L"D:\\#OneDrive\\OrcaSlicer\\resources/web/homepage/index.html",
-          "file:///D:/%23OneDrive/OrcaSlicer/resources/web/homepage/index.html" },
-        { L"\\\\server\\share\\OrcaSlicer\\resources\\web\\homepage\\index.html",
-          "file://server/share/OrcaSlicer/resources/web/homepage/index.html" },
-    }));
-    CHECK(file_url_from_path(boost::filesystem::path(path)).utf8_string() == url);
-}
-
-TEST_CASE("A query appended to a Windows file URL stays separate from its path", "[FileUrl]")
-{
-    const wxURI uri(file_url_from_path(boost::filesystem::path(L"D:\\#OneDrive\\OrcaSlicer\\resources\\web\\guide\\0\\index.html")) +
-                    "?target=21&lang=de");
-    CHECK(wxURI::Unescape(uri.GetPath()) == "/D:/#OneDrive/OrcaSlicer/resources/web/guide/0/index.html");
-    CHECK(uri.GetQuery() == "target=21&lang=de");
-    CHECK(!uri.HasFragment());
-}
-#endif

tests/slic3rutils/test_plugin_capability_config.cpp

@@ -38,6 +38,9 @@ namespace {
 // before this destructor's shutdown() runs.
 struct ScopedPluginManager
 {
+    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
+    // which would otherwise land in the working directory.
+    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = PluginManager::instance().initialize();
 
     ~ScopedPluginManager()

tests/slic3rutils/test_plugin_cloud_metadata.cpp

@@ -31,6 +31,9 @@ namespace {
 // same as any other plugin.
 struct ScopedManagerShutdown
 {
+    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
+    // which would otherwise land in the working directory.
+    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = PluginManager::instance().initialize();
 
     ~ScopedManagerShutdown()

tests/slic3rutils/test_plugin_host_api.cpp

@@ -16,8 +16,6 @@
 
 #include <string>
 
-#include <wx/uri.h>
-
 namespace py = pybind11;
 
 namespace {
@@ -212,33 +210,23 @@ TEST_CASE("A reloaded plugin page is recognised by its base URL, fragment aside"
 {
     using namespace Slic3r::GUI::web_hosting;
 
-    // A resources path holding a space, which the web view may report escaped differently.
+    // A resources path holding a space, which the web view reports escaped.
     const Slic3r::ScopedResourcesDir resources("web content check");
 
     // The swapped-in page, then after an in-page anchor and a reload.
     CHECK(is_content_url(content_base_url()));
     CHECK(is_content_url(content_base_url() + "#tab2"));
-    const wxString unescaped = wxURI::Unescape(content_base_url());
-    REQUIRE(unescaped != content_base_url());
-    CHECK(is_content_url(unescaped));
-    CHECK(is_content_url(unescaped + "#tab2"));
+    wxString escaped = content_base_url();
+    escaped.Replace(" ", "%20");
+    REQUIRE(escaped != content_base_url());
+    CHECK(is_content_url(escaped));
+    CHECK(is_content_url(escaped + "#tab2"));
     // A page the plugin linked to keeps its own URL and must be left alone.
     CHECK_FALSE(is_content_url(content_base_url() + "guide.html"));
     CHECK_FALSE(is_content_url("https://example.com/"));
     CHECK_FALSE(is_content_url(""));
 }
 
-TEST_CASE("A reloaded plugin page is recognised when the resources path holds a '#'", "[PluginHost]")
-{
-    using namespace Slic3r::GUI::web_hosting;
-
-    const Slic3r::ScopedResourcesDir resources("web#content check");
-
-    CHECK(is_content_url(content_base_url()));
-    CHECK(is_content_url(content_base_url() + "#tab2"));
-    CHECK_FALSE(is_content_url(content_base_url() + "guide.html"));
-}
-
 TEST_CASE("Plugin host API exposes model geometry and structure to Python", "[PluginHost][Python]")
 {
     using Catch::Matchers::WithinAbs;

tests/slic3rutils/test_plugin_lifecycle.cpp

@@ -41,6 +41,9 @@ namespace {
 // Declare this FIRST in a test so it is destroyed last.
 struct ScopedPluginManager
 {
+    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
+    // which would otherwise land in the working directory.
+    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = false;
 
     ScopedPluginManager() { initialized = PluginManager::instance().initialize(); }

tests/slic3rutils/test_plugin_printer_agent.cpp

@@ -12,6 +12,8 @@
 #include <memory>
 #include <string>
 
+#include "plugin_test_utils.hpp"
+
 namespace py = pybind11;
 using namespace Slic3r;
 
@@ -21,6 +23,9 @@ namespace {
 // into Python unless PythonInterpreter::instance() reports initialized.
 struct ScopedPluginManager
 {
+    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
+    // which would otherwise land in the working directory.
+    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = PluginManager::instance().initialize();
 
     ~ScopedPluginManager()

tests/slic3rutils/test_printhost.cpp

@@ -1,15 +1,8 @@
 #include <catch2/catch_all.hpp>
 
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <vector>
-
 #include <nlohmann/json.hpp>
 
-#include "libslic3r/LifecycleEvents.hpp"
 #include "slic3r/Utils/PrintHost.hpp"
-#include "slic3r/Utils/Flashforge.hpp"
 
 using namespace Slic3r;
 
@@ -31,41 +24,6 @@ public:
     std::string get_host() const override { return {}; }
 };
 
-class ThrowingPrintHost : public TestPrintHost
-{
-public:
-    bool upload(PrintHostUpload, ProgressFn, ErrorFn, InfoFn) const override { throw std::runtime_error("reply could not be read"); }
-};
-
-struct UploadEvents
-{
-    std::vector<LifecycleEvent>   events;
-    std::vector<LifecycleEvtCode> codes;
-    std::vector<std::string>      errors;
-    bool                          uploaded{false};
-
-    explicit UploadEvents(std::unique_ptr<PrintHost> host)
-    {
-        set_lifecycle_hook_fn([this](LifecycleEvent event, const LifecycleEventContext& ctx) {
-            events.push_back(event);
-            codes.push_back(ctx.code);
-        });
-
-        PrintHostJob job;
-        job.printhost               = std::move(host);
-        job.upload_data.source_path = "plate.gcode";
-        try {
-            uploaded = PrintHostJobQueue::upload_job(job, [](Http::Progress, bool&) {},
-                                                     [this](wxString error) { errors.push_back(error.ToStdString()); },
-                                                     [](wxString, wxString) {});
-        } catch (...) {
-            set_lifecycle_hook_fn(nullptr);
-            throw;
-        }
-        set_lifecycle_hook_fn(nullptr);
-    }
-};
-
 std::string format_error(const std::string& body, const std::string& error, unsigned status)
 {
     return TestPrintHost().format_error(body, error, status).ToStdString();
@@ -88,14 +46,6 @@ std::string moonraker_error(int code, const std::string& message, const std::str
 constexpr const char* k_busy_file_403 =
     R"JSON({"error": {"code": 403, "message": "Forbidden", "traceback": "Traceback (most recent call last):\n\n  File \"/home/lava/moonraker/moonraker/components/file_manager/file_manager.py\", line 1017, in _finish_gcode_upload\n    can_start = self._handle_operation_check(check_path)\n                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n\nmoonraker.utils.exceptions.ServerError: File currently in use\n\nDuring handling of the above exception, another exception occurred:\n\nTraceback (most recent call last):\n\n  File \"/home/lava/moonraker/moonraker/components/application.py\", line 1069, in post\n    raise tornado.web.HTTPError(\ntornado.web.HTTPError: HTTP 403: Forbidden (File is loaded, upload not permitted)\n"}})JSON";
 
-// Replies a print host can send instead of JSON: a proxy or login page, nothing, a cut-off body.
-const std::vector<std::string> non_json_replies = {
-    "<html><body>proxy login required</body></html>",
-    "",
-    "{\"err\":",
-    "{\"detail\":{\"matlStationInfo\":{\"slotInfos\":[{\"slotId\":1,",
-};
-
 } // namespace
 
 TEST_CASE("A Klipper upload error shows its reason instead of a Python traceback", "[PrintHost][Regression]")
@@ -261,114 +211,3 @@ TEST_CASE("Error bodies that are not a Moonraker envelope are left unchanged", "
         CHECK(format_error("", "curl:Could not connect", 0) == "curl:Could not connect");
     }
 }
-
-TEST_CASE("Print host error code is read from a JSON reply", "[PrintHost]")
-{
-    CHECK(PrintHost::get_err_code_from_body(R"({"err":0})") == 0);
-    CHECK(PrintHost::get_err_code_from_body(R"({"err":2})") == 2);
-    CHECK(PrintHost::get_err_code_from_body(R"({"status":"ok"})") == 0);
-}
-
-TEST_CASE("Print host error code reports a reply that is not JSON as an error", "[PrintHost]")
-{
-    const std::string body = GENERATE(from_range(non_json_replies));
-    int err = 0;
-    REQUIRE_NOTHROW(err = PrintHost::get_err_code_from_body(body));
-    CHECK(err != 0);
-}
-
-TEST_CASE("Print host error code tolerates a wrongly typed err field", "[PrintHost]")
-{
-    const std::string body = GENERATE(as<std::string>{}, R"({"err":"busy"})", R"({"err":{"code":1}})", R"([1,2])");
-    CHECK_NOTHROW(PrintHost::get_err_code_from_body(body));
-}
-
-TEST_CASE("Flashforge material slots are read from a well-formed reply", "[PrintHost][Flashforge]")
-{
-    const std::string body = R"({"code":0,"detail":{"hasMatlStation":true,"matlStationInfo":{"slotCnt":2,"slotInfos":[
-        {"slotId":1,"hasFilament":true,"materialName":"PLA","materialColor":"#FFFFFF"},
-        {"slotId":2,"hasFilament":false,"materialName":"","materialColor":""}]}}})";
-
-    std::vector<FlashforgeMaterialSlot> slots;
-    bool supports_station = false;
-    REQUIRE(Flashforge::parse_material_slots(body, slots, &supports_station));
-    CHECK(supports_station);
-    REQUIRE(slots.size() == 2);
-    CHECK(slots[0].slot_id == 1);
-    CHECK(slots[0].has_filament);
-    CHECK(slots[0].material_name == "PLA");
-    CHECK(slots[0].material_color == "#FFFFFF");
-    CHECK(slots[1].slot_id == 2);
-    CHECK_FALSE(slots[1].has_filament);
-}
-
-TEST_CASE("Flashforge material slots accept numbers as strings and flags as numbers", "[PrintHost][Flashforge]")
-{
-    const std::string body = R"({"detail":{"matlStationInfo":{"slotInfos":[
-        {"slotId":"3","hasFilament":1,"materialName":null,"materialColor":7}]}}})";
-
-    std::vector<FlashforgeMaterialSlot> slots;
-    REQUIRE_NOTHROW(Flashforge::parse_material_slots(body, slots, nullptr));
-    REQUIRE(slots.size() == 1);
-    CHECK(slots[0].slot_id == 3);
-    CHECK(slots[0].has_filament);
-    CHECK(slots[0].material_name.empty());
-    CHECK(slots[0].material_color.empty());
-}
-
-TEST_CASE("Flashforge material slots skip entries that are not objects", "[PrintHost][Flashforge]")
-{
-    const std::string body = R"({"detail":{"matlStationInfo":{"slotInfos":[5,"slot",null,[],
-        {"slotId":4,"hasFilament":true,"materialName":"PETG"}]}}})";
-
-    std::vector<FlashforgeMaterialSlot> slots;
-    REQUIRE_NOTHROW(Flashforge::parse_material_slots(body, slots, nullptr));
-    REQUIRE(slots.size() == 1);
-    CHECK(slots[0].slot_id == 4);
-    CHECK(slots[0].material_name == "PETG");
-}
-
-TEST_CASE("Flashforge material slots tolerate slot info that is not a list", "[PrintHost][Flashforge]")
-{
-    const std::string body = GENERATE(as<std::string>{},
-                                      R"({"detail":{"matlStationInfo":{"slotInfos":5}}})",
-                                      R"({"detail":{"matlStationInfo":{"slotInfos":"none"}}})",
-                                      R"({"detail":{"matlStationInfo":7}})",
-                                      R"({"detail":"offline"})");
-
-    std::vector<FlashforgeMaterialSlot> slots;
-    bool ok = false;
-    REQUIRE_NOTHROW(ok = Flashforge::parse_material_slots(body, slots, nullptr));
-    CHECK(ok);
-    CHECK(slots.empty());
-}
-
-TEST_CASE("Flashforge material slots reject a reply that is not JSON", "[PrintHost][Flashforge]")
-{
-    const std::string body = GENERATE(from_range(non_json_replies));
-    std::vector<FlashforgeMaterialSlot> slots;
-    bool ok = true;
-    REQUIRE_NOTHROW(ok = Flashforge::parse_material_slots(body, slots, nullptr));
-    CHECK_FALSE(ok);
-    CHECK(slots.empty());
-}
-
-TEST_CASE("An upload that throws still finishes with an error", "[PrintHost][LifecycleEvents]")
-{
-    UploadEvents run(std::make_unique<ThrowingPrintHost>());
-
-    CHECK_FALSE(run.uploaded);
-    CHECK(run.errors == std::vector<std::string>{"reply could not be read"});
-    CHECK(run.events == std::vector<LifecycleEvent>{LifecycleEvent::UploadStarted, LifecycleEvent::UploadFinished});
-    CHECK(run.codes == std::vector<LifecycleEvtCode>{LifecycleEvtCode::Ok, LifecycleEvtCode::Error});
-}
-
-TEST_CASE("A successful upload finishes without an error", "[PrintHost][LifecycleEvents]")
-{
-    UploadEvents run(std::make_unique<TestPrintHost>());
-
-    CHECK(run.uploaded);
-    CHECK(run.errors.empty());
-    CHECK(run.events == std::vector<LifecycleEvent>{LifecycleEvent::UploadStarted, LifecycleEvent::UploadFinished});
-    CHECK(run.codes == std::vector<LifecycleEvtCode>{LifecycleEvtCode::Ok, LifecycleEvtCode::Ok});
-}

tests/slic3rutils/test_slicing_pipeline_config.cpp

@@ -35,6 +35,9 @@ namespace {
 
 struct ScopedPluginManager
 {
+    // Before initialize(): the interpreter creates {data_dir}/python/packages and {data_dir}/log,
+    // which would otherwise land in the working directory.
+    ScopedDataDir python_data_dir{"plugin-python"};
     bool initialized = false;
 
     ScopedPluginManager() { initialized = PluginManager::instance().initialize(); }

tests/slic3rutils/test_user_manager.cpp

@@ -1,23 +0,0 @@
-#include <catch2/catch_all.hpp>
-
-#include <string>
-
-#include "slic3r/GUI/UserManager.hpp"
-
-using namespace Slic3r;
-
-TEST_CASE("User message that is not JSON is rejected without throwing", "[UserManager]")
-{
-    const std::string payload = GENERATE(as<std::string>{}, "not json", "", "<html></html>", "{\"bind\":");
-    UserManager manager;
-    int result = 0;
-    REQUIRE_NOTHROW(result = manager.parse_json(payload));
-    CHECK(result == -1);
-}
-
-TEST_CASE("User message without a successful bind is ignored", "[UserManager]")
-{
-    const std::string payload = GENERATE(as<std::string>{}, "{}", R"({"bind":{"command":"unbind"}})", R"({"bind":"bind"})", "[1]");
-    UserManager manager;
-    CHECK(manager.parse_json(payload) == -1);
-}