Skip to content

Commit

Permalink
fix config and skip more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mauromalara committed Dec 20, 2023
1 parent 2f98bd9 commit 43c8266
Show file tree
Hide file tree
Showing 14 changed files with 9 additions and 306 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<vulnerability-detector>
<enabled>yes</enabled>
<index-status>yes</index-status>
<feed-update-interval>60m</feed-update-interval>
<feed-update-interval>60s</feed-update-interval>
</vulnerability-detector>
os: linux

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
pytestmark = [TIER0, LINUX]


@pytest.mark.skip(reason="Vulnerability Detector was refactored. Some tests are deprecated.")
@pytest.mark.filterwarnings('ignore::urllib3.exceptions.InsecureRequestWarning')
@pytest.mark.parametrize('metadata', configuration_metadata, ids=cases_ids)
def test_vulnerability_detector_linux(configure_environment, metadata, get_indexer_credentials, get_manager_ip,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<vulnerability-detector>
<enabled>yes</enabled>
<index-status>yes</index-status>
<feed-update-interval>60m</feed-update-interval>
<feed-update-interval>60s</feed-update-interval>
</vulnerability-detector>
os: linux

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
pytestmark = [TIER0, WINDOWS]


@pytest.mark.skip(reason="Vulnerability Detector was refactored. Some tests are deprecated.")
@pytest.mark.filterwarnings('ignore::urllib3.exceptions.InsecureRequestWarning')
@pytest.mark.parametrize('metadata', configuration_metadata, ids=cases_ids)
def test_vulnerability_detector_windows(configure_environment, metadata, get_indexer_credentials, get_manager_ip,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,11 @@
</synchronization>
</wodle>

<wodle name="vulnerability-detector">
<disabled>no</disabled>
<interval>1d</interval>
<run_on_start>yes</run_on_start>
<update_ubuntu_oval interval="60m" version="16,14,12">yes</update_ubuntu_oval>
<update_redhat_oval interval="60m" version="7,6,5">yes</update_redhat_oval>
</wodle>
<vulnerability-detector>
<enabled>yes</enabled>
<index-status>yes</index-status>
<feed-update-interval>60m</feed-update-interval>
</vulnerability-detector>

<wodle name="key-request">
<enabled>yes</enabled>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,6 @@

<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<ignore_time>6h</ignore_time>
<run_on_start>yes</run_on_start>

<provider name="canonical">
<enabled>no</enabled>
<os>precise</os>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<update_interval>1h</update_interval>
</provider>

<provider name="debian">
<enabled>no</enabled>
<os>wheezy</os>
<os>stretch</os>
<os>jessie</os>
<os>buster</os>
<update_interval>1h</update_interval>
</provider>

<provider name="redhat">
<enabled>no</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

<provider name="nvd">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>

</vulnerability-detector>

<syscheck>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,6 @@

<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<ignore_time>6h</ignore_time>
<run_on_start>yes</run_on_start>

<provider name="canonical">
<enabled>no</enabled>
<os>precise</os>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<update_interval>1h</update_interval>
</provider>

<provider name="debian">
<enabled>no</enabled>
<os>wheezy</os>
<os>stretch</os>
<os>jessie</os>
<os>buster</os>
<update_interval>1h</update_interval>
</provider>

<provider name="redhat">
<enabled>no</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

<provider name="nvd">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>

</vulnerability-detector>

<syscheck>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,6 @@

<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<ignore_time>6h</ignore_time>
<run_on_start>yes</run_on_start>

<provider name="canonical">
<enabled>no</enabled>
<os>precise</os>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<update_interval>1h</update_interval>
</provider>

<provider name="debian">
<enabled>no</enabled>
<os>wheezy</os>
<os>stretch</os>
<os>jessie</os>
<os>buster</os>
<update_interval>1h</update_interval>
</provider>

<provider name="redhat">
<enabled>no</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

<provider name="nvd">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>

</vulnerability-detector>

<syscheck>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,6 @@

<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<ignore_time>6h</ignore_time>
<run_on_start>yes</run_on_start>

<provider name="canonical">
<enabled>no</enabled>
<os>precise</os>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<update_interval>1h</update_interval>
</provider>

<provider name="debian">
<enabled>no</enabled>
<os>wheezy</os>
<os>stretch</os>
<os>jessie</os>
<os>buster</os>
<update_interval>1h</update_interval>
</provider>

<provider name="redhat">
<enabled>no</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

<provider name="nvd">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>

</vulnerability-detector>

<syscheck>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,6 @@

<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<ignore_time>6h</ignore_time>
<run_on_start>yes</run_on_start>

<provider name="canonical">
<enabled>no</enabled>
<os>precise</os>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<update_interval>1h</update_interval>
</provider>

<provider name="debian">
<enabled>no</enabled>
<os>wheezy</os>
<os>stretch</os>
<os>jessie</os>
<os>buster</os>
<update_interval>1h</update_interval>
</provider>

<provider name="redhat">
<enabled>no</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

<provider name="nvd">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>

</vulnerability-detector>

<syscheck>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,6 @@

<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<ignore_time>6h</ignore_time>
<run_on_start>yes</run_on_start>

<provider name="canonical">
<enabled>no</enabled>
<os>precise</os>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<update_interval>1h</update_interval>
</provider>

<provider name="debian">
<enabled>no</enabled>
<os>wheezy</os>
<os>stretch</os>
<os>jessie</os>
<os>buster</os>
<update_interval>1h</update_interval>
</provider>

<provider name="redhat">
<enabled>no</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

<provider name="nvd">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>

</vulnerability-detector>

<syscheck>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,6 @@

<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<ignore_time>6h</ignore_time>
<run_on_start>yes</run_on_start>

<provider name="canonical">
<enabled>no</enabled>
<os>precise</os>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<update_interval>1h</update_interval>
</provider>

<provider name="debian">
<enabled>no</enabled>
<os>wheezy</os>
<os>stretch</os>
<os>jessie</os>
<os>buster</os>
<update_interval>1h</update_interval>
</provider>

<provider name="redhat">
<enabled>no</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

<provider name="nvd">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>

</vulnerability-detector>

<syscheck>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,39 +81,6 @@

<vulnerability-detector>
<enabled>no</enabled>
<interval>5m</interval>
<ignore_time>6h</ignore_time>
<run_on_start>yes</run_on_start>

<provider name="canonical">
<enabled>no</enabled>
<os>precise</os>
<os>trusty</os>
<os>xenial</os>
<os>bionic</os>
<update_interval>1h</update_interval>
</provider>

<provider name="debian">
<enabled>no</enabled>
<os>wheezy</os>
<os>stretch</os>
<os>jessie</os>
<os>buster</os>
<update_interval>1h</update_interval>
</provider>

<provider name="redhat">
<enabled>no</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

<provider name="nvd">
<enabled>no</enabled>
<update_interval>1h</update_interval>
</provider>

</vulnerability-detector>

<syscheck>
Expand Down
Loading

0 comments on commit 43c8266

Please sign in to comment.