Skip to content

Commit

Permalink
Revert "disable 1kHz test on all platforms"
Browse files Browse the repository at this point in the history
This reverts commit 758a74f.
  • Loading branch information
mikaelarguedas committed Aug 15, 2018
1 parent 758a74f commit 88ff1a2
Showing 1 changed file with 13 additions and 17 deletions.
30 changes: 13 additions & 17 deletions rclpy/test/test_timer.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
# limitations under the License.

import multiprocessing
# TODO(mikaelarguedas) comment back in if we reenable 1kHz test for some platforms
# import os
# import platform
import os
import platform
import sys
import time
import traceback
Expand Down Expand Up @@ -154,10 +153,9 @@ def test_timer_zero_callbacks100hertz():
# on every platform at high frequency
# TODO(sloretz) Reenable on arm when executor performance is good enough
def test_timer_zero_callbacks1000hertz():
# if os.name == 'nt' or platform.machine() == 'aarch64':
# raise SkipTest
# func_launch(func_zero_callback, ['0.001'], 'received callbacks when not expected')
raise SkipTest
if os.name == 'nt' or platform.machine() == 'aarch64':
raise SkipTest
func_launch(func_zero_callback, ['0.001'], 'received callbacks when not expected')


def test_timer_number_callbacks10hertz():
Expand All @@ -170,11 +168,10 @@ def test_timer_number_callbacks100hertz():


def test_timer_number_callbacks1000hertz():
# if os.name == 'nt' or platform.machine() == 'aarch64':
# raise SkipTest
# func_launch(
# func_number_callbacks, ['0.001'], "didn't receive the expected number of callbacks")
raise SkipTest
if os.name == 'nt' or platform.machine() == 'aarch64':
raise SkipTest
func_launch(
func_number_callbacks, ['0.001'], "didn't receive the expected number of callbacks")


def test_timer_cancel_reset_10hertz():
Expand All @@ -188,8 +185,7 @@ def test_timer_cancel_reset_100hertz():


def test_timer_cancel_reset_1000hertz():
# if os.name == 'nt' or platform.machine() == 'aarch64':
# raise SkipTest
# func_launch(
# func_cancel_reset_timer, ['0.001'], "didn't receive the expected number of callbacks")
raise SkipTest
if os.name == 'nt' or platform.machine() == 'aarch64':
raise SkipTest
func_launch(
func_cancel_reset_timer, ['0.001'], "didn't receive the expected number of callbacks")

0 comments on commit 88ff1a2

Please sign in to comment.